[Telepathy-commits] [telepathy-glib/master] tp_get_bus_proxy: deprecate

[Simon McVittie]

We don't want API users to rely on getting a DBusGProxy for the
dbus-daemon, since that's always going to require binding to all
signals on the interface.
---
 telepathy-glib/dbus.c |    4 +++-
 telepathy-glib/dbus.h |    5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index 69a8f81..717a50b 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -145,9 +145,11 @@ tp_get_bus (void)
 /**
  * tp_get_bus_proxy:
  *
- * <!--Returns: says it all-->
+ * Return a #DBusGProxy for the bus daemon object.
  *
  * Returns: a proxy for the bus daemon object on the starter or session bus.
+ *
+ * Deprecated: 0.7.UNRELEASED: Use tp_dbus_daemon_dup() in new code.
  */
 DBusGProxy *
 tp_get_bus_proxy (void)
diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index 6104817..3be2bee 100644
--- a/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
@@ -28,7 +28,6 @@ G_BEGIN_DECLS
 
 void tp_dbus_g_method_return_not_implemented (DBusGMethodInvocation *context);
 DBusGConnection * tp_get_bus (void);
-DBusGProxy * tp_get_bus_proxy (void);
 
 /* TpDBusDaemon is typedef'd in proxy.h */
 typedef struct _TpDBusDaemonPrivate TpDBusDaemonPrivate;
@@ -126,4 +125,8 @@ G_END_DECLS
 
 #include <telepathy-glib/_gen/tp-cli-dbus-daemon.h>
 
+#ifndef TP_DISABLE_DEPRECATED
+DBusGProxy * tp_get_bus_proxy (void) G_GNUC_DEPRECATED;
+#endif
+
 #endif /* __TELEPATHY_DBUS_H__ */
-- 
1.5.6.5