Manager: get settings from Daemon (#236)

Author: danirabbit

src/Services/Manager.vala

@@ -26,7 +26,8 @@ public interface Bluetooth.Services.AgentManager : Object {
 }
 
 public class Bluetooth.Services.ObjectManager : Object {
-    private const string SCHEMA = "io.elementary.desktop.wingpanel.bluetooth";
+    private const string DAEMON_SCHEMA = "io.elementary.desktop.bluetooth";
+    private const string PANEL_SCHEMA = "io.elementary.desktop.wingpanel.bluetooth";
     public signal void adapter_added (Bluetooth.Services.Adapter adapter);
     public signal void adapter_removed (Bluetooth.Services.Adapter adapter);
     public signal void device_added (Bluetooth.Services.Device device);
@@ -41,16 +42,23 @@ public class Bluetooth.Services.ObjectManager : Object {
     public bool is_connected {get; private set; default = false; }
 
     private bool is_registered = false;
+    private string enabled_key = "enabled";
 
     private Settings? settings = null;
     private GLib.DBusObjectManagerClient object_manager;
     private Bluetooth.Services.AgentManager agent_manager;
     private Bluetooth.Services.Agent agent;
 
     construct {
-        var settings_schema = SettingsSchemaSource.get_default ().lookup (SCHEMA, true);
+        var settings_schema = SettingsSchemaSource.get_default ().lookup (DAEMON_SCHEMA, true);
         if (settings_schema != null) {
-            settings = new Settings (SCHEMA);
+            settings = new Settings (DAEMON_SCHEMA);
+        } else {
+            settings_schema = SettingsSchemaSource.get_default ().lookup (PANEL_SCHEMA, true);
+            if (settings_schema != null) {
+                settings = new Settings (PANEL_SCHEMA);
+                enabled_key = "bluetooth-enabled";
+            }
         }
         create_manager.begin ();
 
@@ -378,7 +386,7 @@ public class Bluetooth.Services.ObjectManager : Object {
         }
 
         if (settings != null) {
-            settings.set_boolean ("bluetooth-enabled", state);
+            settings.set_boolean (enabled_key, state);
         }
 
         if (!state) {