diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-08-19 22:44:54 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-08-19 22:44:54 +0800 |
| commit | 73a5b1104ef2ede807ae856134f075e11b7c90c1 (patch) | |
| tree | 95745a5c29e3873abcd57124b4eba2b2239e8a45 | |
| parent | fe0d5cdd8602bebff90d27f4fd84dbf1790b418f (diff) | |
| parent | dab45aa28b1b60bc2407dc11a652aeb06a8655d4 (diff) | |
| download | gsoc2013-empathy-73a5b1104ef2ede807ae856134f075e11b7c90c1.tar gsoc2013-empathy-73a5b1104ef2ede807ae856134f075e11b7c90c1.tar.gz gsoc2013-empathy-73a5b1104ef2ede807ae856134f075e11b7c90c1.tar.bz2 gsoc2013-empathy-73a5b1104ef2ede807ae856134f075e11b7c90c1.tar.lz gsoc2013-empathy-73a5b1104ef2ede807ae856134f075e11b7c90c1.tar.xz gsoc2013-empathy-73a5b1104ef2ede807ae856134f075e11b7c90c1.tar.zst gsoc2013-empathy-73a5b1104ef2ede807ae856134f075e11b7c90c1.zip | |
Merge commit 'lfrb/added'
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index cb03a97b5..71d8efa67 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -973,10 +973,13 @@ tp_contact_list_add (EmpathyContactList *list, tp_cli_channel_interface_group_call_add_members (priv->subscribe, -1, &handles, message, NULL, NULL, NULL, NULL); } - if (priv->publish && - g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) { - tp_cli_channel_interface_group_call_add_members (priv->publish, - -1, &handles, message, NULL, NULL, NULL, NULL); + if (priv->publish) { + TpChannelGroupFlags flags = tp_channel_group_get_flags (priv->subscribe); + if (flags & TP_CHANNEL_GROUP_FLAG_CAN_ADD || + g_hash_table_lookup (priv->pendings, GUINT_TO_POINTER (handle))) { + tp_cli_channel_interface_group_call_add_members (priv->publish, + -1, &handles, message, NULL, NULL, NULL, NULL); + } } } |