aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-03-22 11:44:12 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-03-22 16:59:10 +0800
commit5d27216d4ee76a9bb460b69370f205652a6d9c09 (patch)
treedf7216b543a49b1daba7870657dd21b6d4a49041 /libempathy
parent17e2fea441df25d3b91597957744f172a0d80668 (diff)
downloadgsoc2013-empathy-5d27216d4ee76a9bb460b69370f205652a6d9c09.tar
gsoc2013-empathy-5d27216d4ee76a9bb460b69370f205652a6d9c09.tar.gz
gsoc2013-empathy-5d27216d4ee76a9bb460b69370f205652a6d9c09.tar.bz2
gsoc2013-empathy-5d27216d4ee76a9bb460b69370f205652a6d9c09.tar.lz
gsoc2013-empathy-5d27216d4ee76a9bb460b69370f205652a6d9c09.tar.xz
gsoc2013-empathy-5d27216d4ee76a9bb460b69370f205652a6d9c09.tar.zst
gsoc2013-empathy-5d27216d4ee76a9bb460b69370f205652a6d9c09.zip
Remove user from the blocked list when readding them
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=645487
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-contact-list.c8
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