Remove tp_dbus_daemon_get_unique_name()

9 files changed, 5 insertions, 27 deletions

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index 4cd1ba554..eaff4e86e 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -1924,7 +1924,6 @@ tp_g_value_slice_new_object_path
 tp_g_value_slice_new_static_object_path
 tp_g_value_slice_new_take_object_path
 <SUBSECTION>
-tp_dbus_daemon_get_unique_name
 tp_dbus_daemon_release_name
 tp_dbus_daemon_request_name
 tp_dbus_daemon_register_object
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index 661fd8e37..b162c69c2 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -1213,7 +1213,7 @@ tp_base_client_constructed (GObject *object)
     {
       gchar *unique;
 
-      unique = tp_escape_as_identifier (tp_dbus_daemon_get_unique_name (
+      unique = tp_escape_as_identifier (g_dbus_connection_get_unique_name (
             self->priv->dbus));
 
       g_string_append_printf (string, ".%s.n%u", unique, unique_counter++);
diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
index cadc860d9..c5e17e7f7 100644
--- a/telepathy-glib/dbus-daemon.c
+++ b/telepathy-glib/dbus-daemon.c
@@ -459,21 +459,3 @@ tp_dbus_daemon_unregister_object (GDBusConnection *dbus_connection,
    * automatically unregister the object (if registered) */
   g_object_set_qdata (object, registration_quark (), NULL);
 }
-
-/**
- * tp_dbus_daemon_get_unique_name:
- * @dbus_connection: a #GDBusConnection
- *
- * <!-- Returns: is enough -->
- *
- * Returns: the unique name of this connection to the bus, which is valid for
- *  as long as this #TpDBusDaemon is
- * Since: 0.7.35
- */
-const gchar *
-tp_dbus_daemon_get_unique_name (GDBusConnection *dbus_connection)
-{
-  g_return_val_if_fail (G_IS_DBUS_CONNECTION (dbus_connection), NULL);
-
-  return g_dbus_connection_get_unique_name (dbus_connection);
-}
diff --git a/telepathy-glib/dbus-daemon.h b/telepathy-glib/dbus-daemon.h
index b30644fe4..ff00fcb2a 100644
--- a/telepathy-glib/dbus-daemon.h
+++ b/telepathy-glib/dbus-daemon.h
@@ -36,8 +36,6 @@ gboolean tp_dbus_daemon_request_name (GDBusConnection *dbus_connection,
 gboolean tp_dbus_daemon_release_name (GDBusConnection *dbus_connection,
     const gchar *well_known_name, GError **error);
 
-const gchar *tp_dbus_daemon_get_unique_name (GDBusConnection *dbus_connection);
-
 void tp_dbus_daemon_register_object (GDBusConnection *dbus_connection,
     const gchar *object_path, gpointer object);
 gboolean tp_dbus_daemon_try_register_object (GDBusConnection *dbus_connection,
diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi
index f8d4ff551..896b51511 100644
--- a/telepathy-glib/versions/main-1.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -786,7 +786,6 @@ tp_dbus_check_valid_bus_name
 tp_dbus_check_valid_interface_name
 tp_dbus_check_valid_member_name
 tp_dbus_check_valid_object_path
-tp_dbus_daemon_get_unique_name
 tp_dbus_daemon_register_object
 tp_dbus_daemon_release_name
 tp_dbus_daemon_request_name
diff --git a/tests/dbus/call-cancellation.c b/tests/dbus/call-cancellation.c
index c2f47de5a..cb011510a 100644
--- a/tests/dbus/call-cancellation.c
+++ b/tests/dbus/call-cancellation.c
@@ -245,7 +245,7 @@ new_proxy (Fixture *f,
     local_factory = f->factory;
 
   return tp_tests_object_new_static_class (TP_TYPE_PROXY,
-      "bus-name", tp_dbus_daemon_get_unique_name (
+      "bus-name", g_dbus_connection_get_unique_name (
           tp_client_factory_get_dbus_connection (f->factory)),
       "object-path", "/",
       "factory", local_factory,
diff --git a/tests/dbus/debug-client.c b/tests/dbus/debug-client.c
index c9096f6c2..aa33cacdf 100644
--- a/tests/dbus/debug-client.c
+++ b/tests/dbus/debug-client.c
@@ -48,7 +48,7 @@ setup (Test *test,
 
   factory = tp_client_factory_new (test->dbus);
   test->client = tp_client_factory_ensure_debug_client (factory,
-      tp_dbus_daemon_get_unique_name (test->dbus), &test->error);
+      g_dbus_connection_get_unique_name (test->dbus), &test->error);
   g_assert_no_error (test->error);
   g_object_unref (factory);
 }
diff --git a/tests/dbus/disconnection.c b/tests/dbus/disconnection.c
index d8ecdf99c..a72f2c9a0 100644
--- a/tests/dbus/disconnection.c
+++ b/tests/dbus/disconnection.c
@@ -202,7 +202,7 @@ new_proxy (Fixture *f,
     local_factory = f->factory;
 
   return tp_tests_object_new_static_class (TP_TYPE_PROXY,
-      "bus-name", tp_dbus_daemon_get_unique_name (
+      "bus-name", g_dbus_connection_get_unique_name (
           tp_client_factory_get_dbus_connection (f->factory)),
       "object-path", "/",
       "factory", local_factory,
diff --git a/tests/dbus/properties.c b/tests/dbus/properties.c
index 649f7b000..0bdb51326 100644
--- a/tests/dbus/properties.c
+++ b/tests/dbus/properties.c
@@ -241,7 +241,7 @@ main (int argc, char **argv)
 
   /* Open a D-Bus connection to myself */
   ctx.proxy = TP_PROXY (tp_tests_object_new_static_class (TP_TYPE_PROXY,
-      "bus-name", tp_dbus_daemon_get_unique_name (dbus_connection),
+      "bus-name", g_dbus_connection_get_unique_name (dbus_connection),
       "object-path", "/",
       "factory", factory,
       NULL));