[gnome-bluetooth/wip/hadess/default-adapter-work: 12/15] lib: Rename default adapter change type




commit cbc70ac6c0863921524a00274ec4b29f06c89376
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 4 16:52:16 2022 +0100

    lib: Rename default adapter change type
    
    "replacement" wasn't really a replacement, we were swapping a proxy for
    a new one attached to the correct D-Bus owner.

 lib/bluetooth-client.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index d258d2be..32e78e83 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -532,7 +532,7 @@ adapter_notify_cb (Adapter1       *adapter,
 }
 
 typedef enum {
-       REPLACEMENT,
+       OWNER_UPDATE,
        NEW_DEFAULT,
        REMOVAL
 } DefaultAdapterChangeType;
@@ -564,15 +564,16 @@ default_adapter_changed (GDBusObjectManager       *manager,
                return;
        } else if (change_type == NEW_DEFAULT) {
                g_debug ("Setting '%s' as the new default adapter", g_dbus_proxy_get_object_path (adapter));
-       } else if (change_type == REPLACEMENT) {
-               g_debug ("Replacing '%s' default adapter proxy", g_dbus_proxy_get_object_path (adapter));
+       } else if (change_type == OWNER_UPDATE) {
+               g_debug ("Updating default adapter proxy '%s' for new owner",
+                        g_dbus_proxy_get_object_path (adapter));
        }
 
        client->default_adapter = ADAPTER1 (g_object_ref (G_OBJECT (adapter)));
        g_signal_connect_object (G_OBJECT (adapter), "notify",
                                 G_CALLBACK (adapter_notify_cb), client, 0);
 
-       if (change_type == REPLACEMENT)
+       if (change_type == OWNER_UPDATE)
                return;
 
        add_devices_to_list_store (client);
@@ -620,11 +621,11 @@ adapter_added (GDBusObjectManager   *manager,
                                         NEW_DEFAULT,
                                         client);
        } else if (is_default_adapter (client, adapter)) {
-               g_debug ("Replacing default adapter with new proxy %s %s %s",
+               g_debug ("Updating default adapter with new proxy %s %s %s",
                         name, adapter_path, iface);
                default_adapter_changed (manager,
                                         G_DBUS_PROXY (adapter),
-                                        REPLACEMENT,
+                                        OWNER_UPDATE,
                                         client);
                return;
        } else {


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