[empathy/gnome-2-34: 1/2] Remove user from the blocked list when readding them

[Guillaume Desmottes <gdesmott src gnome org>]

commit 161c9a2381a9c2df45ef8df81e8b680ce41b5c64
Author: Danielle Madeley <danielle madeley collabora co uk>
Date:   Tue Mar 22 14:44:12 2011 +1100

    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 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 90932a2..30fb4a2 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