diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-22 11:44:12 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-03-22 11:44:12 +0800 |
| commit | 161c9a2381a9c2df45ef8df81e8b680ce41b5c64 (patch) | |
| tree | 85a25fa9f82884491c790204c3dafb7138628874 | |
| parent | 8688c876cd65d1bb058c1ed2ab18256089cf5f07 (diff) | |
| download | gsoc2013-empathy-161c9a2381a9c2df45ef8df81e8b680ce41b5c64.tar gsoc2013-empathy-161c9a2381a9c2df45ef8df81e8b680ce41b5c64.tar.gz gsoc2013-empathy-161c9a2381a9c2df45ef8df81e8b680ce41b5c64.tar.bz2 gsoc2013-empathy-161c9a2381a9c2df45ef8df81e8b680ce41b5c64.tar.lz gsoc2013-empathy-161c9a2381a9c2df45ef8df81e8b680ce41b5c64.tar.xz gsoc2013-empathy-161c9a2381a9c2df45ef8df81e8b680ce41b5c64.tar.zst gsoc2013-empathy-161c9a2381a9c2df45ef8df81e8b680ce41b5c64.zip | |
Remove user from the blocked list when readding them
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=645487
| -rw-r--r-- | libempathy/empathy-tp-contact-list.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 90932a20a..30fb4a2d5 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -1121,10 +1121,12 @@ tp_contact_list_add (EmpathyContactList *list, GArray handles = {(gchar *) &handle, 1}; handle = empathy_contact_get_handle (contact); + if (priv->subscribe) { tp_cli_channel_interface_group_call_add_members (priv->subscribe, -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 || @@ -1133,6 +1135,12 @@ tp_contact_list_add (EmpathyContactList *list, -1, &handles, message, NULL, NULL, NULL, NULL); } } + + if (priv->deny) { + tp_cli_channel_interface_group_call_remove_members ( + priv->deny, -1, &handles, message, + NULL, NULL, NULL, NULL); + } } static void |