From ce0a41ef7bd65f6c1ef5e96bb4317cf5cdf26fc5 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 22 Mar 2011 11:46:37 +0100 Subject: depends on telepathy-glib 0.14.1 We need it for ContactBlocking API. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8e19b451a..76a0762b1 100644 --- a/configure.ac +++ b/configure.ac @@ -40,7 +40,7 @@ GCR_REQUIRED=2.91.4 LIBCANBERRA_GTK_REQUIRED=0.25 LIBNOTIFY_REQUIRED=0.7.0 TELEPATHY_FARSIGHT_REQUIRED=0.0.14 -TELEPATHY_GLIB_REQUIRED=0.13.16 +TELEPATHY_GLIB_REQUIRED=0.14.1 TELEPATHY_LOGGER=0.2.0 # Optional deps -- cgit v1.2.3 From 8b7056b27d71eb651bed271013ab3515b399cc83 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 22 Mar 2011 11:48:15 +0100 Subject: Use stable API for ContactBlocking (#645504) --- libempathy/empathy-tp-contact-list.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libempathy/empathy-tp-contact-list.c b/libempathy/empathy-tp-contact-list.c index 30fb4a2d5..d947e7284 100644 --- a/libempathy/empathy-tp-contact-list.c +++ b/libempathy/empathy-tp-contact-list.c @@ -819,13 +819,13 @@ list_get_contact_blocking_capabilities_cb (TpProxy *conn, { EmpathyTpContactList *list = EMPATHY_TP_CONTACT_LIST (weak_object); EmpathyTpContactListPriv *priv = GET_PRIV (list); - EmpContactBlockingCapabilities caps; + TpContactBlockingCapabilities caps; g_return_if_fail (G_VALUE_HOLDS_UINT (value)); caps = g_value_get_uint (value); - if (caps & EMP_CONTACT_BLOCKING_CAPABILITY_CAN_REPORT_ABUSIVE) { + if (caps & TP_CONTACT_BLOCKING_CAPABILITY_CAN_REPORT_ABUSIVE) { DEBUG ("Connection can report abusive contacts"); priv->flags |= EMPATHY_CONTACT_LIST_CAN_REPORT_ABUSIVE; } @@ -949,11 +949,11 @@ conn_ready_cb (TpConnection *connection, /* Find out if we support reporting abusive contacts -- * this is done via the new Conn.I.ContactBlocking interface */ if (tp_proxy_has_interface_by_id (priv->connection, - EMP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING)) { + TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING)) { DEBUG ("Have Conn.I.ContactBlocking"); tp_cli_dbus_properties_call_get (priv->connection, -1, - EMP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING, + TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING, "ContactBlockingCapabilities", list_get_contact_blocking_capabilities_cb, NULL, NULL, G_OBJECT (list)); @@ -1371,8 +1371,8 @@ tp_contact_list_set_blocked (EmpathyContactList *list, 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, + tp_cli_connection_interface_contact_blocking_call_block_contacts ( + priv->connection, -1, &handles, TRUE, NULL, NULL, NULL, NULL); } else if (blocked) { tp_cli_channel_interface_group_call_add_members ( -- cgit v1.2.3 From f357bd611198d6156f3e58604729e24ad3366cea Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 22 Mar 2011 11:39:23 +0100 Subject: stop generating API for ContactBlocking --- .../Connection_Interface_Contact_Blocking.xml | 172 --------------------- extensions/Makefile.am | 1 - extensions/misc.xml | 1 - 3 files changed, 174 deletions(-) delete mode 100644 extensions/Connection_Interface_Contact_Blocking.xml diff --git a/extensions/Connection_Interface_Contact_Blocking.xml b/extensions/Connection_Interface_Contact_Blocking.xml deleted file mode 100644 index 543d43a5c..000000000 --- a/extensions/Connection_Interface_Contact_Blocking.xml +++ /dev/null @@ -1,172 +0,0 @@ - - - Copyright © 2009-2010 Collabora Ltd. - Copyright © 2009 Nokia Corporation - -

This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version.

- -

This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details.

- -

You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA.

- - - - - -

An interface for connections where contacts can be blocked from - communicating with this user and receiving this user's presence.

- -

When this interface becomes stable, it will replace the ContactList channel with TargetHandleType - Handle_Type_List and TargetID 'deny'.

- - - - -

Direct the server to block some contacts. The precise effect is - protocol-dependent, but SHOULD include ignoring all current and - subsequent communications from the given contacts, avoiding sending - presence to them in future, and if they were already receiving the - local user's presence, behaving as if the local user went - offline.

- -

FIXME: do we need to allow this on protocols where it won't - persist, or where we can't edit the block lists?

- - - - Some contacts to block. - - - - -

In addition to blocking, report these contacts as abusive to the - server administrators.

- -

Clients can determine whether this capability is available by - checking the - ContactBlockingCapabilities - property. If the capability is not present and this argument is - true, the error NotCapable SHOULD - be raised.

- - - Some protocol libraries, in their conformance requirements, - require the ability to report blocked contacts as abusive. - - - - - - - - - - - - - - -

Reverse the effects of a previous call to - BlockContacts.

- - - - Some contacts to unblock. - - - - - - - - - - - -

List the contacts that are blocked.

- -

Clients SHOULD allow a relatively long timeout for calls to this - method, since on some protocols contact blocking is part of the - contact list, which can take a significant time to retrieve.

- - - - The list of blocked contacts. - - - - - - - - - - - -

Emitted when the list of blocked contacts is first retrieved - (before returning from any pending calls to - RequestBlockedContacts), and - whenever the list of blocked contacts subsequently changes.

- - - - Contacts added to the result of - RequestBlockedContacts. - - - - Contacts removed from the result of - RequestBlockedContacts. - - - - - -

True if the contact would be in the result of - RequestBlockedContacts; - False or omitted if the contact is not blocked, or if it is - unknown whether the contact is blocked.

- - - - - -

Additional capabilities for contact blocking (i.e. whether we can - report abusive contacts).

- -

Note: there is no capability for supporting blocking itself, - the presence of this interface indicates that contact blocking is - supported.

- - - - - - - This protocol is capable of reporting abusive contacts to the server - administrators. - - - - - - - diff --git a/extensions/Makefile.am b/extensions/Makefile.am index b3147f301..d0f104821 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -18,7 +18,6 @@ EXTRA_DIST = \ Authentication_TLS_Certificate.xml \ Channel_Interface_Credentials_Storage.xml \ Channel_Type_Server_TLS_Connection.xml \ - Connection_Interface_Contact_Blocking.xml \ $(NULL) noinst_LTLIBRARIES = libemp-extensions.la diff --git a/extensions/misc.xml b/extensions/misc.xml index 9b153f11a..b1f6e88eb 100644 --- a/extensions/misc.xml +++ b/extensions/misc.xml @@ -10,6 +10,5 @@ - -- cgit v1.2.3