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 /libempathy-gtk/empathy-chat.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 'libempathy-gtk/empathy-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 9c6a632bc..71fb2e880 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -244,8 +244,8 @@ account_reconnected (EmpathyChat *chat, account, priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); break; case TP_HANDLE_TYPE_ROOM: - empathy_dispatcher_join_muc (tp_account_get_connection (account), - priv->id, EMPATHY_DISPATCHER_NON_USER_ACTION); + empathy_dispatcher_join_muc (account, priv->id, + EMPATHY_DISPATCHER_NON_USER_ACTION); break; case TP_HANDLE_TYPE_NONE: case TP_HANDLE_TYPE_LIST: @@ -710,8 +710,9 @@ chat_command_join (EmpathyChat *chat, TpConnection *connection; connection = empathy_tp_chat_get_connection (priv->tp_chat); - empathy_dispatcher_join_muc (connection, rooms[i], - gtk_get_current_event_time ()); + empathy_dispatcher_join_muc ( + empathy_get_account_for_connection (connection), rooms[i], + gtk_get_current_event_time ()); } i++; } |