[gnome-bluetooth/wip/hadess/hide-unpairable-devices] settings-widget: Don't show devices without a name




commit 274b856f11bcbb2be67ebc25151c0ae796baab9a
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Feb 10 14:13:29 2021 +0100

    settings-widget: Don't show devices without a name
    
    Hide discovered devices with names.
    
    Closes: #44
    
    Thanks to Erik Duxstad for their initial patch:
    https://gitlab.gnome.org/GNOME/gnome-bluetooth/-/merge_requests/36

 lib/bluetooth-settings-widget.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/lib/bluetooth-settings-widget.c b/lib/bluetooth-settings-widget.c
index 36e0761a..15ac0a39 100644
--- a/lib/bluetooth-settings-widget.c
+++ b/lib/bluetooth-settings-widget.c
@@ -1632,22 +1632,23 @@ row_inserted_cb (GtkTreeModel *tree_model,
        gboolean paired, trusted, connected, legacy_pairing;
        GtkWidget *row;
 
-       if (is_interesting_device (tree_model, iter) == FALSE) {
-               gtk_tree_model_get (tree_model, iter,
-                                   BLUETOOTH_COLUMN_NAME, &name,
-                                   -1);
-               g_debug ("Not adding device '%s'", name);
+       gtk_tree_model_get (tree_model, iter,
+                           BLUETOOTH_COLUMN_NAME, &name,
+                           BLUETOOTH_COLUMN_ADDRESS, &bdaddr,
+                           -1);
+
+       if (name == NULL ||
+           is_interesting_device (tree_model, iter) == FALSE) {
+               g_debug ("Not adding device '%s'", name ? name : bdaddr);
                return;
        }
 
        gtk_tree_model_get (tree_model, iter,
                            BLUETOOTH_COLUMN_PROXY, &proxy,
-                           BLUETOOTH_COLUMN_NAME, &name,
                            BLUETOOTH_COLUMN_ALIAS, &alias,
                            BLUETOOTH_COLUMN_PAIRED, &paired,
                            BLUETOOTH_COLUMN_TRUSTED, &trusted,
                            BLUETOOTH_COLUMN_CONNECTED, &connected,
-                           BLUETOOTH_COLUMN_ADDRESS, &bdaddr,
                            BLUETOOTH_COLUMN_TYPE, &type,
                            BLUETOOTH_COLUMN_LEGACYPAIRING, &legacy_pairing,
                            -1);


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