X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=9dce476fcaa3818a045b9859f4319207538acd50;hb=138f4d6a450e4ead5da85fdef006e48e906223d8;hp=e71492c0a43c6466ac9c50adabbd5a560074ceed;hpb=fd0d4300a0cd2459ae71a410d59db154d07a2ab2;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index e71492c..9dce476 100644
--- 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;
 };
@@ -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);
@@ -394,10 +395,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);