[gnome-bluetooth/wip/hadess/set-powered: 1/2] lib: Remove adapter power-up




commit 4b7a5559085d91ad6e85a1d8495b927bc6e875d0
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Jan 18 10:59:50 2022 +0100

    lib: Remove adapter power-up
    
    Remove the adapter power-up when a new default adapter is added. This
    should avoid unwanted power-up on the adapter.

 lib/bluetooth-client.c | 6 ------
 tests/integration-test | 3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c
index ab035cda..d2e2195c 100644
--- a/lib/bluetooth-client.c
+++ b/lib/bluetooth-client.c
@@ -561,8 +561,6 @@ default_adapter_changed (GDBusObjectManager       *manager,
                         DefaultAdapterChangeType  change_type,
                         BluetoothClient          *client)
 {
-       gboolean powered;
-
        if (change_type == REMOVAL) {
                g_clear_object (&client->default_adapter);
                g_debug ("Emptying list store as default adapter removed");
@@ -596,10 +594,6 @@ default_adapter_changed (GDBusObjectManager       *manager,
 
        g_debug ("New default adapter so invalidating all the default-adapter* properties");
        notify_default_adapter_props (client);
-
-       powered = adapter1_get_powered (client->default_adapter);
-       if (!powered)
-               adapter_set_powered (client, TRUE);
 }
 
 static gboolean
diff --git a/tests/integration-test b/tests/integration-test
index 530ba060..2ad777cc 100755
--- a/tests/integration-test
+++ b/tests/integration-test
@@ -259,6 +259,9 @@ class OopTests(dbusmock.DBusTestCase):
         dbusprops_bluez = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/hci0'), 
'org.freedesktop.DBus.Properties')
 
         self.assertEqual(dbusprops_bluez.Get('org.bluez.Adapter1', 'Powered'), False)
+        self.wait_for_mainloop()
+        self.assertEqual(dbusprops_bluez.Get('org.bluez.Adapter1', 'Powered'), False)
+        self.client.props.default_adapter_powered = True
         self.wait_for_condition(lambda: dbusprops_bluez.Get('org.bluez.Adapter1', 'Powered') == True)
         self.assertEqual(self.client.props.num_adapters, 1)
         self.assertEqual(dbusprops_bluez.Get('org.bluez.Adapter1', 'Powered'), True)


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