From 5d27216d4ee76a9bb460b69370f205652a6d9c09 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Tue, 22 Mar 2011 14:44:12 +1100 Subject: Remove user from the blocked list when readding them Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=645487 --- libempathy/empathy-tp-contact-list.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libempathy') 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 -- cgit v1.2.3