diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 21:28:09 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 21:28:09 +0800 |
| commit | d339921eaf86de17aaae585070ae479cfbf4734f (patch) | |
| tree | e1256e36416e33da304fae666718e558944a6237 /src/empathy.c | |
| parent | fabcd2ec298f6773112c6fad57238c6f7bc2d77e (diff) | |
| download | gsoc2013-empathy-d339921eaf86de17aaae585070ae479cfbf4734f.tar gsoc2013-empathy-d339921eaf86de17aaae585070ae479cfbf4734f.tar.gz gsoc2013-empathy-d339921eaf86de17aaae585070ae479cfbf4734f.tar.bz2 gsoc2013-empathy-d339921eaf86de17aaae585070ae479cfbf4734f.tar.lz gsoc2013-empathy-d339921eaf86de17aaae585070ae479cfbf4734f.tar.xz gsoc2013-empathy-d339921eaf86de17aaae585070ae479cfbf4734f.tar.zst gsoc2013-empathy-d339921eaf86de17aaae585070ae479cfbf4734f.zip | |
empathy_dispatcher_join_muc: get an account instead of a connection
Diffstat (limited to 'src/empathy.c')
| -rw-r--r-- | src/empathy.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/empathy.c b/src/empathy.c index aefb934eb..c1282808a 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -298,13 +298,10 @@ account_status_changed_cb (TpAccount *account, GHashTable *details, EmpathyChatroom *room) { - TpConnection *conn; - - conn = tp_account_get_connection (account); - if (conn == NULL) + if (new_status != TP_CONNECTION_STATUS_CONNECTED) return; - empathy_dispatcher_join_muc (conn, + empathy_dispatcher_join_muc (account, empathy_chatroom_get_room (room), EMPATHY_DISPATCHER_NON_USER_ACTION); } @@ -352,7 +349,7 @@ account_manager_chatroom_ready_cb (GObject *source_object, } else { - empathy_dispatcher_join_muc (conn, + empathy_dispatcher_join_muc (account, empathy_chatroom_get_room (room), EMPATHY_DISPATCHER_NON_USER_ACTION); } |