[gnome-bluetooth/wip/hadess/dump-device-removal] lib: Remove bluetooth_client_dump_device()




commit 633abe492d9d99feefb81d8b3f928370550d89b0
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Nov 30 14:48:43 2021 +0100

    lib: Remove bluetooth_client_dump_device()
    
    There's a similar function available for BluetoothDevice objects.

 .ci/gbt.suppr                  |  4 +++
 lib/bluetooth-client-private.h |  3 --
 lib/bluetooth-client.c         | 68 ------------------------------------------
 lib/gnome-bluetooth.map        |  1 -
 4 files changed, 4 insertions(+), 72 deletions(-)
---
diff --git a/.ci/gbt.suppr b/.ci/gbt.suppr
index aab0f0e3..b07b3c6c 100644
--- a/.ci/gbt.suppr
+++ b/.ci/gbt.suppr
@@ -37,3 +37,7 @@ drop = yes
 [suppress_function]
 symbol_name = bluetooth_client_get_model
 drop = yes
+
+[suppress_function]
+symbol_name = bluetooth_client_dump_device
+drop = yes
diff --git a/lib/bluetooth-client-private.h b/lib/bluetooth-client-private.h
index 4fd85d1d..34b8140e 100644
--- a/lib/bluetooth-client-private.h
+++ b/lib/bluetooth-client-private.h
@@ -55,9 +55,6 @@ gboolean bluetooth_client_cancel_setup_device_finish (BluetoothClient *client,
 gboolean bluetooth_client_set_trusted(BluetoothClient *client,
                                        const char *device, gboolean trusted);
 
-void bluetooth_client_dump_device (GtkTreeModel *model,
-                                  GtkTreeIter *iter);
-
 gboolean bluetooth_client_get_connectable(const char **uuids);
 
 GDBusProxy *_bluetooth_client_get_default_adapter (BluetoothClient *client);
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index 96dcbe9a..2785cdde 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -1633,71 +1633,3 @@ bluetooth_client_connect_service_finish (BluetoothClient *client,
 
        return g_task_propagate_boolean (task, error);
 }
-
-#define BOOL_STR(x) (x ? "True" : "False")
-
-void
-bluetooth_client_dump_device (GtkTreeModel *model,
-                             GtkTreeIter *iter)
-{
-       GDBusProxy *proxy;
-       char *address, *alias, *icon, **uuids;
-       gboolean is_default, paired, trusted, connected, discovering, powered, is_adapter;
-       GtkTreeIter parent;
-       BluetoothType type;
-
-       gtk_tree_model_get (model, iter,
-                           BLUETOOTH_COLUMN_ADDRESS, &address,
-                           BLUETOOTH_COLUMN_ALIAS, &alias,
-                           BLUETOOTH_COLUMN_TYPE, &type,
-                           BLUETOOTH_COLUMN_ICON, &icon,
-                           BLUETOOTH_COLUMN_DEFAULT, &is_default,
-                           BLUETOOTH_COLUMN_PAIRED, &paired,
-                           BLUETOOTH_COLUMN_TRUSTED, &trusted,
-                           BLUETOOTH_COLUMN_CONNECTED, &connected,
-                           BLUETOOTH_COLUMN_DISCOVERING, &discovering,
-                           BLUETOOTH_COLUMN_POWERED, &powered,
-                           BLUETOOTH_COLUMN_UUIDS, &uuids,
-                           BLUETOOTH_COLUMN_PROXY, &proxy,
-                           -1);
-       if (proxy) {
-               char *basename;
-               basename = g_path_get_basename(g_dbus_proxy_get_object_path(proxy));
-               is_adapter = !g_str_has_prefix (basename, "dev_");
-               g_free (basename);
-       } else {
-               is_adapter = !gtk_tree_model_iter_parent (model, &parent, iter);
-       }
-
-       if (is_adapter != FALSE) {
-               /* Adapter */
-               g_print ("Adapter: %s (%s)\n", alias, address);
-               if (is_default)
-                       g_print ("\tDefault adapter\n");
-               g_print ("\tD-Bus Path: %s\n", proxy ? g_dbus_proxy_get_object_path (proxy) : "(none)");
-               if (discovering)
-                       g_print ("\tDiscovery in progress\n");
-               g_print ("\t%s\n", powered ? "Is powered" : "Is not powered");
-       } else {
-               /* Device */
-               g_print ("Device: %s (%s)\n", alias, address);
-               g_print ("\tD-Bus Path: %s\n", proxy ? g_dbus_proxy_get_object_path (proxy) : "(none)");
-               g_print ("\tType: %s Icon: %s\n", bluetooth_type_to_string (type), icon);
-               g_print ("\tPaired: %s Trusted: %s Connected: %s\n", BOOL_STR(paired), BOOL_STR(trusted), 
BOOL_STR(connected));
-               if (uuids != NULL) {
-                       guint i;
-                       g_print ("\tUUIDs: ");
-                       for (i = 0; uuids[i] != NULL; i++)
-                               g_print ("%s ", uuids[i]);
-                       g_print ("\n");
-               }
-       }
-       g_print ("\n");
-
-       g_free (alias);
-       g_free (address);
-       g_free (icon);
-       g_clear_object (&proxy);
-       g_strfreev (uuids);
-}
-
diff --git a/lib/gnome-bluetooth.map b/lib/gnome-bluetooth.map
index c57e249b..f18a4970 100644
--- a/lib/gnome-bluetooth.map
+++ b/lib/gnome-bluetooth.map
@@ -4,7 +4,6 @@ global:
   bluetooth_client_setup_device_finish;
   bluetooth_client_cancel_setup_device;
   bluetooth_client_cancel_setup_device_finish;
-  bluetooth_client_dump_device;
   bluetooth_client_get_type;
   bluetooth_client_new;
   bluetooth_client_get_devices;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]