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 /src/empathy-chat-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 'src/empathy-chat-manager.c')
| -rw-r--r-- | src/empathy-chat-manager.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 8bdc97e90..666147de6 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -192,8 +192,6 @@ process_tp_chat (EmpathyChatManager *self, * channel has been approved. */ empathy_tp_chat_join (tp_chat); } - - g_object_unref (tp_chat); } typedef struct @@ -264,22 +262,19 @@ handle_channels (TpSimpleHandler *handler, for (l = channels; l != NULL; l = g_list_next (l)) { - TpChannel *channel = l->data; - EmpathyTpChat *tp_chat; + EmpathyTpChat *tp_chat = l->data; - if (tp_proxy_get_invalidated (channel) != NULL) + if (tp_proxy_get_invalidated (tp_chat) != NULL) continue; - if (!TP_IS_TEXT_CHANNEL (channel)) + if (!EMPATHY_IS_TP_CHAT (tp_chat)) { DEBUG ("Channel %s doesn't implement Messages; can't handle it", - tp_proxy_get_object_path (channel)); + tp_proxy_get_object_path (tp_chat)); continue; } - DEBUG ("Now handling channel %s", tp_proxy_get_object_path (channel)); - - tp_chat = empathy_tp_chat_new (account, channel); + DEBUG ("Now handling channel %s", tp_proxy_get_object_path (tp_chat)); if (empathy_tp_chat_is_ready (tp_chat)) { |