diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2007-12-03 23:12:05 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2007-12-03 23:12:05 +0800 |
| commit | de24c820d141079b880de18e3ff6c28955588732 (patch) | |
| tree | e74bf299ff2fde4a7fce370a2714b90b4b9389cd /libempathy-gtk/empathy-group-chat.c | |
| parent | 1fe7346f60e911fa37a22361c34efc6baa946bf8 (diff) | |
| download | gsoc2013-empathy-de24c820d141079b880de18e3ff6c28955588732.tar gsoc2013-empathy-de24c820d141079b880de18e3ff6c28955588732.tar.gz gsoc2013-empathy-de24c820d141079b880de18e3ff6c28955588732.tar.bz2 gsoc2013-empathy-de24c820d141079b880de18e3ff6c28955588732.tar.lz gsoc2013-empathy-de24c820d141079b880de18e3ff6c28955588732.tar.xz gsoc2013-empathy-de24c820d141079b880de18e3ff6c28955588732.tar.zst gsoc2013-empathy-de24c820d141079b880de18e3ff6c28955588732.zip | |
Cleanup chat objects API and request a new Text channel if account gets
2007-12-03 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/empathy-chat-window.c:
* libempathy-gtk/empathy-chat.c:
* libempathy-gtk/empathy-chat.h:
* libempathy-gtk/empathy-group-chat.c:
* libempathy-gtk/empathy-group-chat.h:
* libempathy-gtk/empathy-private-chat.c:
* libempathy-gtk/empathy-private-chat.h:
* libempathy/empathy-tp-chat.c:
* libempathy/empathy-tp-chat.h:
* python/pyempathy/pyempathy.defs:
* python/pyempathygtk/pyempathygtk.defs:
* src/empathy-chat-chandler.c: Cleanup chat objects API and request a
new Text channel if account gets reconnected.
svn path=/trunk/; revision=461
Diffstat (limited to 'libempathy-gtk/empathy-group-chat.c')
| -rw-r--r-- | libempathy-gtk/empathy-group-chat.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/libempathy-gtk/empathy-group-chat.c b/libempathy-gtk/empathy-group-chat.c index 948f728e5..777514652 100644 --- a/libempathy-gtk/empathy-group-chat.c +++ b/libempathy-gtk/empathy-group-chat.c @@ -175,22 +175,15 @@ group_chat_finalize (GObject *object) } EmpathyGroupChat * -empathy_group_chat_new (McAccount *account, - TpChan *tp_chan) +empathy_group_chat_new (EmpathyTpChatroom *tp_chat) { - EmpathyGroupChat *chat; - EmpathyGroupChatPriv *priv; - - g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL); - g_return_val_if_fail (TELEPATHY_IS_CHAN (tp_chan), NULL); + EmpathyGroupChat *chat; - chat = g_object_new (EMPATHY_TYPE_GROUP_CHAT, NULL); - - priv = GET_PRIV (chat); + g_return_val_if_fail (EMPATHY_IS_TP_CHAT (tp_chat), NULL); - EMPATHY_CHAT (chat)->account = g_object_ref (account); - priv->tp_chat = empathy_tp_chatroom_new (account, tp_chan); - empathy_chat_set_tp_chat (EMPATHY_CHAT (chat), EMPATHY_TP_CHAT (priv->tp_chat)); + chat = g_object_new (EMPATHY_TYPE_GROUP_CHAT, + "tp-chat", tp_chat, + NULL); return chat; } |