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-main-window.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-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index d99d2ab0b..ff8bb5e98 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -948,16 +948,13 @@ join_chatroom (EmpathyChatroom *chatroom, gint64 timestamp) { TpAccount *account; - TpConnection *connection; const gchar *room; account = empathy_chatroom_get_account (chatroom); - connection = tp_account_get_connection (account); - g_assert (connection != NULL); room = empathy_chatroom_get_room (chatroom); DEBUG ("Requesting channel for '%s'", room); - empathy_dispatcher_join_muc (connection, room, timestamp); + empathy_dispatcher_join_muc (account, room, timestamp); } typedef struct |