Allow to set custom function for getting groups of a contact. Make

[empathy.git] / src / empathy-chat-main.c

diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c
index 287766594371284a360fb1d37bb203243ff0b6d7..339c4d0fa317409017b6a188e7bd2e56c5a51d02 100644 (file)
--- a/src/empathy-chat-main.c
+++ b/src/empathy-chat-main.c
@@ -128,11 +128,8 @@ new_channel_cb (EmpathyChandler *chandler,
                        g_object_unref (tp_chat);
                }
                gossip_chat_present (chat);
-
-               goto OUT;
        }
-
-       if (tp_chan->handle_type == TP_HANDLE_TYPE_CONTACT) {
+       else if (tp_chan->handle_type == TP_HANDLE_TYPE_CONTACT) {
                EmpathyContactManager *manager;
                EmpathyTpContactList  *list;
                GossipContact         *contact;
@@ -157,7 +154,7 @@ new_channel_cb (EmpathyChandler *chandler,
                g_object_unref (chat);
                g_object_unref (manager);
        }
-       if (tp_chan->handle_type == TP_HANDLE_TYPE_ROOM) {
+       else if (tp_chan->handle_type == TP_HANDLE_TYPE_ROOM) {
 #if 0
                GossipGroupChat *chat;
 
@@ -176,7 +173,6 @@ new_channel_cb (EmpathyChandler *chandler,
 #endif
        }
 
-OUT:
        g_free (id);
        g_object_unref (account);
        g_object_unref (mc);