aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2011-02-14 09:44:34 +0800
committerChandni Verma <chandniverma2112@gmail.com>2011-03-11 13:10:24 +0800
commit5690460d1809f6e181c3eeed2aa930af1253b38c (patch)
tree3718c15281b97984ead3b3418bb8b3ff901c0896 /libempathy
parent4b7d2787c3d4487647628109e14a6618e3db8da8 (diff)
downloadgsoc2013-empathy-5690460d1809f6e181c3eeed2aa930af1253b38c.tar
gsoc2013-empathy-5690460d1809f6e181c3eeed2aa930af1253b38c.tar.gz
gsoc2013-empathy-5690460d1809f6e181c3eeed2aa930af1253b38c.tar.bz2
gsoc2013-empathy-5690460d1809f6e181c3eeed2aa930af1253b38c.tar.lz
gsoc2013-empathy-5690460d1809f6e181c3eeed2aa930af1253b38c.tar.xz
gsoc2013-empathy-5690460d1809f6e181c3eeed2aa930af1253b38c.tar.zst
gsoc2013-empathy-5690460d1809f6e181c3eeed2aa930af1253b38c.zip
Use Conn.I.CB to report contacts as abusive when blocking them
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-contact-list.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c
index 028744285..90932a20a 100644
--- a/libempathy/empathy-tp-contact-list.c
+++ b/libempathy/empathy-tp-contact-list.c
@@ -1358,14 +1358,23 @@ tp_contact_list_set_blocked (EmpathyContactList *list,
g_return_if_fail (TP_IS_CHANNEL (priv->deny));
- if (blocked)
+ if (blocked && abusive) {
+ /* we have to do this via the new interface */
+ g_return_if_fail (priv->flags &
+ EMPATHY_CONTACT_LIST_CAN_REPORT_ABUSIVE);
+
+ emp_cli_connection_interface_contact_blocking_call_block_contacts (
+ TP_PROXY (priv->connection), -1,
+ &handles, TRUE, NULL, NULL, NULL, NULL);
+ } else if (blocked) {
tp_cli_channel_interface_group_call_add_members (
priv->deny, -1,
&handles, NULL, NULL, NULL, NULL, NULL);
- else
+ } else {
tp_cli_channel_interface_group_call_remove_members (
priv->deny, -1,
&handles, NULL, NULL, NULL, NULL, NULL);
+ }
}
static gboolean