diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 22:20:42 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-11 22:20:42 +0800 |
| commit | 95efa6ca70aa8cf1dc3283706c2254f45cad59c5 (patch) | |
| tree | 003064fac6c22f387e9f21dfabe455801fbc4b77 /src/empathy.c | |
| parent | 9a48fa95672a4e3287dc6564f676bed5dbb7d358 (diff) | |
| parent | 734ecf362e856ea8cc61f119dc371cd90b7851af (diff) | |
| download | gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.gz gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.bz2 gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.lz gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.xz gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.tar.zst gsoc2013-empathy-95efa6ca70aa8cf1dc3283706c2254f45cad59c5.zip | |
Merge branch 'request-chat-626630'
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); } |