Skip to content

Commit f60cda6

Browse files
ryonakanostsdc
authored andcommitted
Avoid duplicated instances of GLib.Settings
1 parent 756ab91 commit f60cda6

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

src/Indicator/Indicator.vala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55

66
// TODO: Change namespace
77
public class Monitor.Indicator : Wingpanel.Indicator {
8+
public static Settings settings;
9+
810
private Widgets.DisplayWidget ? display_widget = null;
911
private Widgets.PopoverWidget ? popover_widget = null;
10-
private Settings settings;
1112
private DBusClient dbusclient;
1213

14+
static construct {
15+
settings = new Settings ("io.elementary.monitor.settings");
16+
}
17+
1318
construct {
1419
Gtk.IconTheme.get_default ().add_resource_path ("/io/elementary/monitor/icons");
15-
settings = new Settings ("io.elementary.monitor.settings");
1620
this.visible = false;
1721
display_widget = new Widgets.DisplayWidget ();
1822
popover_widget = new Widgets.PopoverWidget ();

src/Indicator/Widgets/DisplayWidget.vala

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,18 @@ public class Monitor.Widgets.DisplayWidget : Gtk.Grid {
2020
construct {
2121
valign = Gtk.Align.CENTER;
2222

23-
var settings = new Settings ("io.elementary.monitor.settings");
2423
unowned var dbusclient = DBusClient.get_default ();
2524

2625
dbusclient.monitor_appeared.connect (() => {
27-
cpu_widget.visible = settings.get_boolean ("indicator-cpu-state");
28-
cpu_frequency_widget.visible = settings.get_boolean ("indicator-cpu-frequency-state");
29-
cpu_temperature_widget.visible = settings.get_boolean ("indicator-cpu-temperature-state");
30-
memory_widget.visible = settings.get_boolean ("indicator-memory-state");
31-
network_up_widget.visible = settings.get_boolean ("indicator-network-upload-state");
32-
network_down_widget.visible = settings.get_boolean ("indicator-network-download-state");
33-
gpu_widget.visible = settings.get_boolean ("indicator-gpu-state");
34-
gpu_memory_widget.visible = settings.get_boolean ("indicator-gpu-memory-state");
35-
gpu_temperature_widget.visible = settings.get_boolean ("indicator-gpu-temperature-state");
26+
cpu_widget.visible = Indicator.settings.get_boolean ("indicator-cpu-state");
27+
cpu_frequency_widget.visible = Indicator.settings.get_boolean ("indicator-cpu-frequency-state");
28+
cpu_temperature_widget.visible = Indicator.settings.get_boolean ("indicator-cpu-temperature-state");
29+
memory_widget.visible = Indicator.settings.get_boolean ("indicator-memory-state");
30+
network_up_widget.visible = Indicator.settings.get_boolean ("indicator-network-upload-state");
31+
network_down_widget.visible = Indicator.settings.get_boolean ("indicator-network-download-state");
32+
gpu_widget.visible = Indicator.settings.get_boolean ("indicator-gpu-state");
33+
gpu_memory_widget.visible = Indicator.settings.get_boolean ("indicator-gpu-memory-state");
34+
gpu_temperature_widget.visible = Indicator.settings.get_boolean ("indicator-gpu-temperature-state");
3635
});
3736

3837
dbusclient.interface.indicator_cpu_state.connect ((state) => cpu_widget.visible = state);

0 commit comments

Comments
 (0)