[empathy] chat: get the account from the tp-chat
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] chat: get the account from the tp-chat
- Date: Thu, 12 Aug 2010 15:00:43 +0000 (UTC)
commit ce0fe44e47aa8c1b5365d1e3140aff59fcfff4f7
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Aug 12 16:25:53 2010 +0200
chat: get the account from the tp-chat
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 71fb2e8..45faea4 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),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]