avoid configuration data in psensor struct

[psensor.git] / src / ui_sensorpref.c

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index e71492c..78fb551 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -22,14 +22,12 @@
 
 #include <cfg.h>
 #include <temperature.h>
+#include <ui_appindicator.h>
 #include <ui_pref.h>
 #include <ui_sensorlist.h>
 #include <ui_sensorpref.h>
 #include <ui_color.h>
 
-#if defined(HAVE_APPINDICATOR)
-#include <ui_appindicator.h>
-#endif
 
 enum {
        COL_NAME = 0,
@@ -44,7 +42,7 @@ struct sensor_pref {
        int alarm_enabled;
        int alarm_high_threshold;
        int alarm_low_threshold;
-       unsigned int appindicator_enabled;
+       bool appindicator_enabled;
        unsigned int appindicator_label_enabled;
        unsigned int display_enabled;
 };
@@ -63,8 +61,8 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 
        p->sensor = s;
        p->name = strdup(s->name);
-       p->graph_enabled = s->graph_enabled;
-       p->alarm_enabled = s->alarm_enabled;
+       p->graph_enabled = config_is_sensor_graph_enabled(s->id);
+       p->alarm_enabled = config_get_sensor_alarm_enabled(s->id);
        p->color = color_dup(s->color);
        p->display_enabled = config_is_sensor_enabled(s->id);
 
@@ -78,7 +76,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
                        = celsius_to_fahrenheit(s->alarm_low_threshold);
        }
 
-       p->appindicator_enabled = s->appindicator_enabled;
+       p->appindicator_enabled = config_is_appindicator_enabled(s->id);
        p->appindicator_label_enabled
                = config_is_appindicator_label_enabled(s->id);
 
@@ -290,18 +288,21 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
                (gtk_builder_get_object(builder, "indicator_label_checkbox"));
 
 
-#if !HAVE_APPINDICATOR
-       gtk_widget_set_sensitive(GTK_WIDGET(w_appindicator_label_enabled),
-                                FALSE);
-       gtk_widget_set_sensitive(GTK_WIDGET(w_appindicator_enabled), FALSE);
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_label_enabled),
-                                  TRUE);
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_enabled), TRUE);
-#else
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_label_enabled),
-                                  FALSE);
-       gtk_widget_set_has_tooltip(GTK_WIDGET(w_appindicator_enabled), FALSE);
-#endif
+       if (is_appindicator_supported()) {
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_label_enabled), FALSE);
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_enabled), FALSE);
+       } else {
+               gtk_widget_set_sensitive
+                       (GTK_WIDGET(w_appindicator_label_enabled), FALSE);
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_label_enabled), TRUE);
+               gtk_widget_set_sensitive
+                       (GTK_WIDGET(w_appindicator_enabled), FALSE);
+               gtk_widget_set_has_tooltip
+                       (GTK_WIDGET(w_appindicator_enabled), TRUE);
+       }
 
        gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
        gtk_spin_button_set_value(w_high_threshold, p->alarm_high_threshold);
@@ -365,10 +366,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
                config_set_sensor_name(s->id, s->name);
        }
 
-       if (s->graph_enabled != p->graph_enabled) {
-               s->graph_enabled = p->graph_enabled;
-               config_set_sensor_graph_enabled(s->id, s->graph_enabled);
-       }
+       config_set_sensor_graph_enabled(s->id, p->graph_enabled);
 
        if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
                s->alarm_high_threshold
@@ -383,10 +381,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
        config_set_sensor_alarm_high_threshold(s->id, s->alarm_high_threshold);
        config_set_sensor_alarm_low_threshold(s->id, s->alarm_low_threshold);
 
-       if (s->alarm_enabled != p->alarm_enabled) {
-               s->alarm_enabled = p->alarm_enabled;
-               config_set_sensor_alarm_enabled(s->id, s->alarm_enabled);
-       }
+       config_set_sensor_alarm_enabled(s->id, p->alarm_enabled);
 
        color_set(s->color,
                  p->color->red,
@@ -394,10 +389,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
                  p->color->blue);
        config_set_sensor_color(s->id, s->color);
 
-       if (s->appindicator_enabled != p->appindicator_enabled) {
-               s->appindicator_enabled = p->appindicator_enabled;
-               config_set_appindicator_enabled(s->id, s->appindicator_enabled);
-       }
+       config_set_appindicator_enabled(s->id, p->appindicator_enabled);
 
        config_set_appindicator_label_enabled(s->id,
                                              p->appindicator_label_enabled);