Skip to content

Commit 94606fb

Browse files
committed
Manager: get settings from Daemon
1 parent bae61a1 commit 94606fb

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/Services/Manager.vala

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public interface Bluetooth.Services.AgentManager : Object {
2626
}
2727

2828
public class Bluetooth.Services.ObjectManager : Object {
29-
private const string SCHEMA = "io.elementary.desktop.wingpanel.bluetooth";
29+
private const string DAEMON_SCHEMA = "io.elementary.desktop.bluetooth";
30+
private const string PANEL_SCHEMA = "io.elementary.desktop.wingpanel.bluetooth";
3031
public signal void adapter_added (Bluetooth.Services.Adapter adapter);
3132
public signal void adapter_removed (Bluetooth.Services.Adapter adapter);
3233
public signal void device_added (Bluetooth.Services.Device device);
@@ -48,9 +49,14 @@ public class Bluetooth.Services.ObjectManager : Object {
4849
private Bluetooth.Services.Agent agent;
4950

5051
construct {
51-
var settings_schema = SettingsSchemaSource.get_default ().lookup (SCHEMA, true);
52+
var settings_schema = SettingsSchemaSource.get_default ().lookup (DAEMON_SCHEMA, true);
5253
if (settings_schema != null) {
53-
settings = new Settings (SCHEMA);
54+
settings = new Settings (DAEMON_SCHEMA);
55+
} else {
56+
settings_schema = SettingsSchemaSource.get_default ().lookup (PANEL_SCHEMA, true);
57+
if (settings_schema != null) {
58+
settings = new Settings (PANEL_SCHEMA);
59+
}
5460
}
5561
create_manager.begin ();
5662

0 commit comments

Comments
 (0)