[gnome-bluetooth/wip/hadess/default-adapter-work: 13/15] lib: Use highest numbered adapter as the default one

[Bastien Nocera <hadess src gnome org>]

commit 15afe804f1937d92393389e7bd705e165bc63fe7
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 5 13:48:49 2022 +0100

    lib: Use highest numbered adapter as the default one
    
    This makes sure that whether, say, hci1 is plugged in before starting
    the programme using gnome-bluetooth, or after it's been started, the
    default adapter will still be hci1.
    
    The old behaviour could have caused discrepancies in what gnome-shell
    (long-running) and gnome-control-center saw as the default adapter.

 lib/bluetooth-client.c | 31 ++++++++++++++++++++++++++++++-
 tests/integration-test |  2 +-
 2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index 32e78e83..f8cc1317 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -533,6 +533,7 @@ adapter_notify_cb (Adapter1       *adapter,
 
 typedef enum {
        OWNER_UPDATE,
+       REPLACEMENT,
        NEW_DEFAULT,
        REMOVAL
 } DefaultAdapterChangeType;
@@ -547,6 +548,10 @@ notify_default_adapter_props (BluetoothClient *client)
        g_object_notify (G_OBJECT (client), "default-adapter-name");
 }
 
+static void
+_bluetooth_client_set_default_adapter_discovering (BluetoothClient *client,
+                                                  gboolean         discovering);
+
 static void
 default_adapter_changed (GDBusObjectManager       *manager,
                         GDBusProxy               *adapter,
@@ -555,18 +560,26 @@ default_adapter_changed (GDBusObjectManager       *manager,
 {
        gboolean powered;
 
-       g_clear_object (&client->default_adapter);
        if (change_type == REMOVAL) {
+               g_clear_object (&client->default_adapter);
                g_debug ("Emptying list store as default adapter removed");
                g_list_store_remove_all (client->list_store);
                g_debug ("No default adapter so invalidating all the default-adapter* properties");
                notify_default_adapter_props (client);
                return;
        } else if (change_type == NEW_DEFAULT) {
+               g_clear_object (&client->default_adapter);
                g_debug ("Setting '%s' as the new default adapter", g_dbus_proxy_get_object_path (adapter));
        } else if (change_type == OWNER_UPDATE) {
+               g_clear_object (&client->default_adapter);
                g_debug ("Updating default adapter proxy '%s' for new owner",
                         g_dbus_proxy_get_object_path (adapter));
+       } else if (change_type == REPLACEMENT) {
+               g_debug ("Emptying list store as old default adapter removed");
+               g_list_store_remove_all (client->list_store);
+               g_debug ("Disabling discovery on old default adapter");
+               _bluetooth_client_set_default_adapter_discovering (client, FALSE);
+               g_clear_object (&client->default_adapter);
        }
 
        client->default_adapter = ADAPTER1 (g_object_ref (G_OBJECT (adapter)));
@@ -601,6 +614,14 @@ is_default_adapter (BluetoothClient *client,
        return (g_strcmp0 (adapter_path, default_adapter_path) == 0);
 }
 
+static gboolean
+should_be_default_adapter (BluetoothClient *client,
+                          Adapter1        *adapter)
+{
+       return g_strcmp0 (g_dbus_proxy_get_object_path (G_DBUS_PROXY (adapter)),
+                         g_dbus_proxy_get_object_path (G_DBUS_PROXY (client->default_adapter))) > 0;
+}
+
 static void
 adapter_added (GDBusObjectManager   *manager,
               Adapter1             *adapter,
@@ -628,6 +649,14 @@ adapter_added (GDBusObjectManager   *manager,
                                         OWNER_UPDATE,
                                         client);
                return;
+       } else if (should_be_default_adapter (client, adapter)) {
+               g_debug ("Replacing default adapter %s with %s %s %s",
+                        g_dbus_proxy_get_name_owner (G_DBUS_PROXY (client->default_adapter)),
+                        name, adapter_path, iface);
+               default_adapter_changed (manager,
+                                        G_DBUS_PROXY (adapter),
+                                        REPLACEMENT,
+                                        client);
        } else {
                g_debug ("Ignoring added non-default adapter %s %s %s",
                         name, adapter_path, iface);
diff --git a/tests/integration-test b/tests/integration-test
index c6798ef5..7627540f 100755
--- a/tests/integration-test
+++ b/tests/integration-test
@@ -235,7 +235,7 @@ class OopTests(dbusmock.DBusTestCase):
         self.assertEqual(list_store.get_n_items(), 1)
         device = list_store.get_item(0)
         self.assertIsNotNone(device)
-        self.assertEqual(device.props.name, 'Device on hci0')
+        self.assertEqual(device.props.name, 'Device on hci1')
 
     def test_default_adapter_powered(self):
         bus = dbus.SystemBus()