diff options
| author | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2009-08-07 01:24:42 +0800 |
|---|---|---|
| committer | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2009-08-19 04:11:09 +0800 |
| commit | dab45aa28b1b60bc2407dc11a652aeb06a8655d4 (patch) | |
| tree | a817725f25099f7346aee32743c6fb078089515f | |
| parent | 8231bae19efd93b161c03c5638e9cc0ca9b07e0b (diff) | |
| download | gsoc2013-empathy-dab45aa28b1b60bc2407dc11a652aeb06a8655d4.tar gsoc2013-empathy-dab45aa28b1b60bc2407dc11a652aeb06a8655d4.tar.gz gsoc2013-empathy-dab45aa28b1b60bc2407dc11a652aeb06a8655d4.tar.bz2 gsoc2013-empathy-dab45aa28b1b60bc2407dc11a652aeb06a8655d4.tar.lz gsoc2013-empathy-dab45aa28b1b60bc2407dc11a652aeb06a8655d4.tar.xz gsoc2013-empathy-dab45aa28b1b60bc2407dc11a652aeb06a8655d4.tar.zst gsoc2013-empathy-dab45aa28b1b60bc2407dc11a652aeb06a8655d4.zip | |
Always add to publish list
| -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 7c94bc756..f305cfae1 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); + } } } |