diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-12 22:25:53 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-08-12 22:25:53 +0800 |
| commit | ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7 (patch) | |
| tree | e3e2e8ff050b7fd9d0672d969c36c39c8101e42b | |
| parent | 567a34cbbb5c93b40ee44739fff9a908bd31195b (diff) | |
| download | gsoc2013-empathy-ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7.tar gsoc2013-empathy-ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7.tar.gz gsoc2013-empathy-ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7.tar.bz2 gsoc2013-empathy-ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7.tar.lz gsoc2013-empathy-ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7.tar.xz gsoc2013-empathy-ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7.tar.zst gsoc2013-empathy-ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7.zip | |
chat: get the account from the tp-chat
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 71fb2e880..45faea4fb 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -710,8 +710,7 @@ chat_command_join (EmpathyChat *chat, TpConnection *connection; connection = empathy_tp_chat_get_connection (priv->tp_chat); - empathy_dispatcher_join_muc ( - empathy_get_account_for_connection (connection), rooms[i], + empathy_dispatcher_join_muc (priv->account, rooms[i], gtk_get_current_event_time ()); } i++; @@ -3013,7 +3012,7 @@ empathy_chat_set_tp_chat (EmpathyChat *chat, priv->tp_chat = g_object_ref (tp_chat); connection = empathy_tp_chat_get_connection (priv->tp_chat); - priv->account = g_object_ref (empathy_get_account_for_connection (connection)); + priv->account = g_object_ref (empathy_tp_chat_get_account (priv->tp_chat)); g_signal_connect (tp_chat, "destroy", G_CALLBACK (chat_destroy_cb), |