diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-05-20 18:26:38 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2007-05-20 18:26:38 +0800 |
| commit | a989fd0d5279244468bd8d033ff9c2eb09c80299 (patch) | |
| tree | dc93aa2b5cd8e546bc6efdbf2402bbc37bde7e5b /src | |
| parent | 4f2ebd488115fb76eef2671aa47d220a65f1d9a8 (diff) | |
| download | gsoc2013-empathy-a989fd0d5279244468bd8d033ff9c2eb09c80299.tar gsoc2013-empathy-a989fd0d5279244468bd8d033ff9c2eb09c80299.tar.gz gsoc2013-empathy-a989fd0d5279244468bd8d033ff9c2eb09c80299.tar.bz2 gsoc2013-empathy-a989fd0d5279244468bd8d033ff9c2eb09c80299.tar.lz gsoc2013-empathy-a989fd0d5279244468bd8d033ff9c2eb09c80299.tar.xz gsoc2013-empathy-a989fd0d5279244468bd8d033ff9c2eb09c80299.tar.zst gsoc2013-empathy-a989fd0d5279244468bd8d033ff9c2eb09c80299.zip | |
2007-05-20 Xavier Claessens <xclaesse@gmail.com>
* libempathy-gtk/gossip-contact-list-store.c: Allow to set custom
function for getting groups of a contact. Make possible to have groups
for presence or role/affiliation in chatroom for example.
* libempathy-gtk/gossip-contact-list-store.h: Allow to set custom
function to handle DnD of contact. Useful when a custom function is set
for groups.
* src/empathy-chat-main.c: Minor fix.
* TODO:
* po/POTFILES.in: Updated.
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@76 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-chat-main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/empathy-chat-main.c b/src/empathy-chat-main.c index 287766594..339c4d0fa 100644 --- 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); |