fd.o #24114: deprecate tp_get_bus() in favour of tp_dbus_daemon_dup()

Because tp_get_bus() is deprecated, and we want to fail on use of
deprecated functions in general, I've essentially inlined a copy into
tp_get_bus_proxy (which is itself deprecated).

1 files changed, 12 insertions, 2 deletions

diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index f08e36e99..17b8ab128 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -121,6 +121,8 @@ _tp_dbus_starter_bus_conn (GError **error)
  * Most processes should use tp_dbus_daemon_dup() instead.
  *
  * Returns: a connection to the starter or session D-Bus daemon.
+ *
+ * Deprecated: 0.11.UNRELEASED: Use tp_dbus_daemon_dup() in new code.
  */
 DBusGConnection *
 tp_get_bus (void)
@@ -140,7 +142,8 @@ tp_get_bus (void)
 /**
  * tp_get_bus_proxy:
  *
- * Return a #DBusGProxy for the bus daemon object.
+ * Return a #DBusGProxy for the bus daemon object. The same caveats as for
+ * tp_get_bus() apply.
  *
  * Returns: a proxy for the bus daemon object on the starter or session bus.
  *
@@ -153,7 +156,14 @@ tp_get_bus_proxy (void)
 
   if (bus_proxy == NULL)
     {
-      DBusGConnection *bus = tp_get_bus ();
+      GError *error = NULL;
+      DBusGConnection *bus = _tp_dbus_starter_bus_conn (&error);
+
+      if (bus == NULL)
+        {
+          g_warning ("Failed to connect to starter bus: %s", error->message);
+          exit (1);
+        }
 
       bus_proxy = dbus_g_proxy_new_for_name (bus,
                                             "org.freedesktop.DBus",