TpDBusDaemon: Remove code for listing names

The few places where it was used can use GDBusConnection directly

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

4 files changed, 0 insertions, 108 deletions

diff --git a/docs/reference/telepathy-glib/telepathy-glib-sections.txt b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
index baa1447eb..dd7c6aea1 100644
--- a/docs/reference/telepathy-glib/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib/telepathy-glib-sections.txt
@@ -1929,9 +1929,6 @@ TpDBusDaemonClass
 tp_dbus_daemon_dup
 tp_dbus_daemon_new
 tp_dbus_daemon_get_unique_name
-TpDBusDaemonListNamesCb
-tp_dbus_daemon_list_names
-tp_dbus_daemon_list_activatable_names
 tp_dbus_daemon_release_name
 tp_dbus_daemon_request_name
 tp_dbus_daemon_register_object
diff --git a/telepathy-glib/dbus-daemon.c b/telepathy-glib/dbus-daemon.c
index d22ee0c18..3602ca88a 100644
--- a/telepathy-glib/dbus-daemon.c
+++ b/telepathy-glib/dbus-daemon.c
@@ -619,99 +619,6 @@ tp_dbus_daemon_get_unique_name (TpDBusDaemon *self)
       tp_proxy_get_dbus_connection (self));
 }
 
-/**
- * TpDBusDaemonListNamesCb:
- * @bus_daemon: object representing a connection to a bus
- * @names: constant %NULL-terminated array of constant strings representing
- *  bus names, or %NULL on error
- * @error: the error that occurred, or %NULL on success
- * @user_data: the same user data that was passed to
- *  tp_dbus_daemon_list_names or tp_dbus_daemon_list_activatable_names
- * @weak_object: the same object that was passed to
- *  tp_dbus_daemon_list_names or tp_dbus_daemon_list_activatable_names
- *
- * Signature of a callback for functions that list bus names.
- *
- * Since: 0.7.35
- */
-
-/**
- * tp_dbus_daemon_list_names:
- * @self: object representing a connection to a bus
- * @timeout_ms: timeout for the call
- * @callback: callback to be called on success or failure; must not be %NULL
- * @user_data: opaque user-supplied data to pass to the callback
- * @destroy: if not %NULL, called with @user_data as argument after the call
- *  has succeeded or failed, or after @weak_object has been destroyed
- * @weak_object: if not %NULL, a GObject which will be weakly referenced; if
- *  it is destroyed, @callback will not be called at all
- *
- * Call the ListNames method on the bus daemon, asynchronously. The @callback
- * will be called from the main loop with a list of all the names (either
- * unique or well-known) that exist on the bus.
- *
- * Since: 0.7.35
- */
-void
-tp_dbus_daemon_list_names (TpDBusDaemon *self,
-    gint timeout_ms,
-    TpDBusDaemonListNamesCb callback,
-    gpointer user_data,
-    GDestroyNotify destroy,
-    GObject *weak_object)
-{
-  /* This is the same type as TpDBusDaemonListNamesCb, spelled out
-   * explicitly to make it clearer that the cast below is OK... */
-  void (*explicit_callback) (TpDBusDaemon *, const gchar * const *,
-      const GError *, gpointer, GObject *) = callback;
-  /* ... and this is the same type as
-   * tp_cli_dbus_daemon_callback_for_list_names, which differs only in
-   * the constness of its second parameter. Again, spelling it out explicitly
-   * in the declaration to make it clearer that it's OK to do. */
-  void (*cast_callback) (TpDBusDaemon *, const gchar **,
-      const GError *, gpointer, GObject *) =
-    (tp_cli_dbus_daemon_callback_for_list_names) explicit_callback;
-
-  tp_cli_dbus_daemon_call_list_names (self, timeout_ms,
-      cast_callback, user_data, destroy, weak_object);
-}
-
-/**
- * tp_dbus_daemon_list_activatable_names:
- * @self: object representing a connection to a bus daemon
- * @timeout_ms: timeout for the call
- * @callback: callback to be called on success or failure; must not be %NULL
- * @user_data: opaque user-supplied data to pass to the callback
- * @destroy: if not %NULL, called with @user_data as argument after the call
- *  has succeeded or failed, or after @weak_object has been destroyed
- * @weak_object: if not %NULL, a GObject which will be weakly referenced; if
- *  it is destroyed, @callback will not be called at all
- *
- * Call the ListActivatableNames method on the bus daemon, asynchronously.
- * The @callback will be called from the main loop with a list of all the
- * well-known names that are available for service-activation on the bus.
- *
- * Since: 0.7.35
- */
-void
-tp_dbus_daemon_list_activatable_names (TpDBusDaemon *self,
-    gint timeout_ms,
-    TpDBusDaemonListNamesCb callback,
-    gpointer user_data,
-    GDestroyNotify destroy,
-    GObject *weak_object)
-{
-  /* Same comments as for ListNames */
-  void (*explicit_callback) (TpDBusDaemon *, const gchar * const *,
-      const GError *, gpointer, GObject *) = callback;
-  void (*cast_callback) (TpDBusDaemon *, const gchar **,
-      const GError *, gpointer, GObject *) =
-    (tp_cli_dbus_daemon_callback_for_list_activatable_names) explicit_callback;
-
-  tp_cli_dbus_daemon_call_list_activatable_names (self, timeout_ms,
-      cast_callback, user_data, destroy, weak_object);
-}
-
 static GObject *
 tp_dbus_daemon_constructor (GType type,
                             guint n_params,
diff --git a/telepathy-glib/dbus-daemon.h b/telepathy-glib/dbus-daemon.h
index f931eb323..45fa49d41 100644
--- a/telepathy-glib/dbus-daemon.h
+++ b/telepathy-glib/dbus-daemon.h
@@ -64,16 +64,6 @@ gboolean tp_dbus_daemon_release_name (TpDBusDaemon *self,
 
 const gchar *tp_dbus_daemon_get_unique_name (TpDBusDaemon *self);
 
-typedef void (*TpDBusDaemonListNamesCb) (TpDBusDaemon *bus_daemon,
-    const gchar * const *names, const GError *error, gpointer user_data,
-    GObject *weak_object);
-void tp_dbus_daemon_list_names (TpDBusDaemon *self,
-    gint timeout_ms, TpDBusDaemonListNamesCb callback,
-    gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
-void tp_dbus_daemon_list_activatable_names (TpDBusDaemon *self,
-    gint timeout_ms, TpDBusDaemonListNamesCb callback,
-    gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
-
 void tp_dbus_daemon_register_object (TpDBusDaemon *self,
     const gchar *object_path, gpointer object);
 gboolean tp_dbus_daemon_try_register_object (TpDBusDaemon *self,
diff --git a/telepathy-glib/versions/main-1.0.abi b/telepathy-glib/versions/main-1.0.abi
index 6f8377ee2..0921ad5d4 100644
--- a/telepathy-glib/versions/main-1.0.abi
+++ b/telepathy-glib/versions/main-1.0.abi
@@ -799,8 +799,6 @@ tp_dbus_check_valid_object_path
 tp_dbus_daemon_dup
 tp_dbus_daemon_get_type
 tp_dbus_daemon_get_unique_name
-tp_dbus_daemon_list_activatable_names
-tp_dbus_daemon_list_names
 tp_dbus_daemon_new
 tp_dbus_daemon_register_object
 tp_dbus_daemon_release_name