diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-02-11 21:53:50 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-05-25 15:22:41 +0800 |
| commit | 0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c (patch) | |
| tree | 22d694d8dce6c66151362c1301e3fa9a6291ff9a /libempathy/empathy-chatroom-manager.c | |
| parent | 4e39c2c5adac55793143c110159fa40cc51f324c (diff) | |
| download | gsoc2013-empathy-0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c.tar gsoc2013-empathy-0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c.tar.gz gsoc2013-empathy-0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c.tar.bz2 gsoc2013-empathy-0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c.tar.lz gsoc2013-empathy-0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c.tar.xz gsoc2013-empathy-0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c.tar.zst gsoc2013-empathy-0dd8e6cbd7b903d2ce8b56995e4b4ac6ed042f2c.zip | |
EmpathyTpChat: inherit from TpTextChannel (#650554)
Diffstat (limited to 'libempathy/empathy-chatroom-manager.c')
| -rw-r--r-- | libempathy/empathy-chatroom-manager.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index 53786343b..00b54200f 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -882,18 +882,16 @@ observe_channels_cb (TpSimpleObserver *observer, for (l = channels; l != NULL; l = g_list_next (l)) { - TpChannel *channel = l->data; - EmpathyTpChat *tp_chat; + EmpathyTpChat *tp_chat = l->data; const gchar *roomname; EmpathyChatroom *chatroom; - if (tp_proxy_get_invalidated (channel) != NULL) + if (tp_proxy_get_invalidated ((TpChannel *) tp_chat) != NULL) continue; - if (!TP_IS_TEXT_CHANNEL (channel)) + if (!EMPATHY_IS_TP_CHAT (tp_chat)) continue; - tp_chat = empathy_tp_chat_new (account, channel); roomname = empathy_tp_chat_get_id (tp_chat); chatroom = empathy_chatroom_manager_find (self, account, roomname); @@ -906,7 +904,6 @@ observe_channels_cb (TpSimpleObserver *observer, } empathy_chatroom_set_tp_chat (chatroom, tp_chat); - g_object_unref (tp_chat); /* A TpChat is always destroyed as it only gets unreffed after the channel * has been invalidated in the dispatcher.. */ |