[next] telepathy-glib: Deprecate tp_list_connection_managers

[Xavier Claessens]

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

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri May  4 16:47:13 2012 +0100

Deprecate tp_list_connection_managers

---

 telepathy-glib/connection-manager.c |    4 ++++
 telepathy-glib/connection-manager.h |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 8c5627f..5017b7c 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -1807,6 +1807,8 @@ tp_list_connection_managers_got_names (TpDBusDaemon *bus_daemon,
  * occurred while launching that connection manager.
  *
  * Since: 0.7.1
+ *
+ * Deprecated: since 0.UNRELEASED, use tp_list_connection_managers_async()
  */
 void
 tp_list_connection_managers (TpDBusDaemon *bus_daemon,
@@ -1910,8 +1912,10 @@ tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon,
     }
   else
     {
+      G_GNUC_BEGIN_IGNORE_DEPRECATIONS
       tp_list_connection_managers (dbus_daemon,
           list_connection_managers_async_cb, result, g_object_unref, NULL);
+      G_GNUC_END_IGNORE_DEPRECATIONS
       g_object_unref (dbus_daemon);
     }
 }
diff --git a/telepathy-glib/connection-manager.h b/telepathy-glib/connection-manager.h
index efc1566..eac21fe 100644
--- a/telepathy-glib/connection-manager.h
+++ b/telepathy-glib/connection-manager.h
@@ -112,10 +112,13 @@ typedef void (*TpConnectionManagerListCb) (TpConnectionManager * const *cms,
     gsize n_cms, const GError *error, gpointer user_data,
     GObject *weak_object);
 
+#ifndef TP_DISABLE_DEPRECATED
+_TP_DEPRECATED_IN_UNRELEASED_FOR (tp_list_connection_managers_async)
 void tp_list_connection_managers (TpDBusDaemon *bus_daemon,
     TpConnectionManagerListCb callback,
     gpointer user_data, GDestroyNotify destroy,
     GObject *weak_object);
+#endif
 
 _TP_AVAILABLE_IN_0_18
 void tp_list_connection_managers_async (TpDBusDaemon *dbus_daemon,