aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-05-20 18:26:38 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-05-20 18:26:38 +0800
commit49676b7823685463409a3653e00ce4707f00d226 (patch)
treedc93aa2b5cd8e546bc6efdbf2402bbc37bde7e5b /src
parent1ff555e581a89646fa252706d41ae822d1e023e4 (diff)
downloadgsoc2013-empathy-49676b7823685463409a3653e00ce4707f00d226.tar
gsoc2013-empathy-49676b7823685463409a3653e00ce4707f00d226.tar.gz
gsoc2013-empathy-49676b7823685463409a3653e00ce4707f00d226.tar.bz2
gsoc2013-empathy-49676b7823685463409a3653e00ce4707f00d226.tar.lz
gsoc2013-empathy-49676b7823685463409a3653e00ce4707f00d226.tar.xz
gsoc2013-empathy-49676b7823685463409a3653e00ce4707f00d226.tar.zst
gsoc2013-empathy-49676b7823685463409a3653e00ce4707f00d226.zip
Allow to set custom function for getting groups of a contact. Make
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. svn path=/trunk/; revision=76
Diffstat (limited to 'src')
-rw-r--r--src/empathy-chat-main.c8
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);