[next] telepathy-glib: Deprecate reimplementation of RequestHandles

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: 8c275d9585df2575cbcc61b54ab74969baa10ea6
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=8c275d9585df2575cbcc61b54ab74969baa10ea6

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon May  7 16:49:10 2012 +0100

Deprecate reimplementation of RequestHandles

Gabble hasn't done this since 2009, and this function has been removed
from the public API on 'next' (it interferes with separating tp_svc_*
out of the main library).

Reviewed-by: Xavier Claessens <xavier.claessens at collabora.co.uk>

---

 telepathy-glib/base-connection.c |   13 ++++++++-----
 telepathy-glib/base-connection.h |    3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 0fc3d9f..6b2f869 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -2530,11 +2530,12 @@ tp_base_connection_release_handles (TpSvcConnection *iface,
  * @context: The dbus-glib method invocation context
  *
  * Implements D-Bus method RequestHandles on interface
- * org.freedesktop.Telepathy.Connection. Exported so subclasses can
- * use it as a basis for their own implementations (for instance,
- * at the time of writing Gabble's GabbleConnection does its own processing
- * for room handles, in order to validate them asynchronously, but delegates
- * to this implementation for all other types).
+ * org.freedesktop.Telepathy.Connection.
+ *
+ * This was exported so subclasses could use it as a basis for their
+ * reimplementations, but reimplementing the method is now deprecated.
+ *
+ * Deprecated: 0.UNRELEASED
  */
 void
 tp_base_connection_dbus_request_handles (TpSvcConnection *iface,
@@ -3402,7 +3403,9 @@ conn_iface_init (gpointer g_iface, gpointer iface_data)
   IMPLEMENT(,list_channels);
   IMPLEMENT(,request_channel);
   IMPLEMENT(,release_handles);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   IMPLEMENT(dbus_,request_handles);
+G_GNUC_END_IGNORE_DEPRECATIONS
   IMPLEMENT(dbus_,add_client_interest);
   IMPLEMENT(dbus_,remove_client_interest);
 #undef IMPLEMENT
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 903a6ca..99738e1 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -150,8 +150,11 @@ void tp_base_connection_finish_shutdown (TpBaseConnection *self);
 void tp_base_connection_add_interfaces (TpBaseConnection *self,
     const gchar **interfaces);
 
+#ifndef TP_DISABLE_DEPRECATED
+_TP_DEPRECATED_IN_UNRELEASED
 void tp_base_connection_dbus_request_handles (TpSvcConnection *iface,
     guint handle_type, const gchar **names, DBusGMethodInvocation *context);
+#endif
 
 void tp_base_connection_register_with_contacts_mixin (TpBaseConnection *self);