Attachment 52798 Details for Bug 42281 – Advertise ContactBlocking if supported

[patch] Advertise ContactBlocking if supported

Advertise-ContactBlocking-if-supported.patch (text/plain), 2.85 KB, created by Guillaume Desmottes on 2011-10-26 07:04:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2011-10-26 07:04:04 UTC

Size: 2.85 KB

patch

obsolete

>From 02cb56ab9a8264c95bed1d42a4bc50246bcf2109 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Wed, 26 Oct 2011 15:50:31 +0200
>Subject: [PATCH] Advertise ContactBlocking if supported
>
>https://bugs.freedesktop.org/show_bug.cgi?id=42281
>---
> configure.ac                               |    2 +-
> src/connection.c                           |    8 ++++++++
> tests/twisted/constants.py                 |    1 +
> tests/twisted/roster/test-google-roster.py |    3 +++
> 4 files changed, 13 insertions(+), 1 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index e61dea0..50b15cf 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -10,7 +10,7 @@ AC_PREREQ([2.59])
> m4_define([gabble_major_version], [0])
> m4_define([gabble_minor_version], [13])
> m4_define([gabble_micro_version], [7])
>-m4_define([gabble_nano_version], [1])
>+m4_define([gabble_nano_version], [0])
> 
> # Some magic
> m4_define([gabble_base_version],
>diff --git a/src/connection.c b/src/connection.c
>index 1ea7d65..74e58e7 100644
>--- a/src/connection.c
>+++ b/src/connection.c
>@@ -2815,6 +2815,14 @@ set_status_to_connected (GabbleConnection *conn)
>       tp_base_connection_add_interfaces ((TpBaseConnection *) conn, ifaces);
>     }
> 
>+  if (tp_base_contact_list_can_block (gabble_connection_get_contact_list (conn)))
>+    {
>+      const gchar *ifaces[] =
>+        { TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING, NULL };
>+
>+      tp_base_connection_add_interfaces ((TpBaseConnection *) conn, ifaces);
>+    }
>+
>   /* go go gadget on-line */
>   tp_base_connection_change_status (base,
>       TP_CONNECTION_STATUS_CONNECTED, TP_CONNECTION_STATUS_REASON_REQUESTED);
>diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
>index e9381cd..bbb10ca 100644
>--- a/tests/twisted/constants.py
>+++ b/tests/twisted/constants.py
>@@ -137,6 +137,7 @@ CONN_IFACE_CONTACT_LIST = CONN + '.Interface.ContactList'
> CONN_IFACE_CONTACT_GROUPS = CONN + '.Interface.ContactGroups'
> CONN_IFACE_CLIENT_TYPES = CONN + '.Interface.ClientTypes'
> CONN_IFACE_POWER_SAVING = CONN + '.Interface.PowerSaving'
>+CONN_IFACE_CONTACT_BLOCKING = CONN + '.Interface.ContactBlocking'
> 
> ATTR_CONTACT_CAPABILITIES = CONN_IFACE_CONTACT_CAPS + '/capabilities'
> 
>diff --git a/tests/twisted/roster/test-google-roster.py b/tests/twisted/roster/test-google-roster.py
>index 630e3c3..d6c5598 100644
>--- a/tests/twisted/roster/test-google-roster.py
>+++ b/tests/twisted/roster/test-google-roster.py
>@@ -295,6 +295,9 @@ def test_deny_simple(q, bus, conn, stream, stored, deny):
>         EventPattern('dbus-return', method='RemoveMembers'),
>         )
> 
>+    assertContains(cs.CONN_IFACE_CONTACT_BLOCKING,
>+        conn.Properties.Get(cs.CONN, "Interfaces"))
>+
>     # Our server sends roster pushes in response to our unsubscribe and
>     # unsubscribed commands.
>     stream.send(make_set_roster_iq(stream, 'test@localhost/Resource', contact,
>-- 
>1.7.4.1

Actions: View | Splinter Review

Attachments on bug 42281: 52797 | 52798 | 52799 | 52800

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.