X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=ff93a02bfa838f212e1799827361390d9067e08a;hb=7fe35c5f020a37c5b54676b98af44cc73fbe48df;hp=d9a909c68a3f40874863833acf73971de64d9804;hpb=5f275b753e5b28de21690bd9bacb53262e59c58a;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index d9a909c..ff93a02 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -22,16 +22,13 @@
 
 #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) || defined(HAVE_APPINDICATOR_029)
-#include "ui_appindicator.h"
-#endif
-
 enum {
 	COL_NAME = 0,
 	COL_SENSOR_PREF
@@ -89,7 +86,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 static void sensor_pref_free(struct sensor_pref *p)
 {
 	if (!p)
-		return ;
+		return;
 
 	free(p->name);
 	free(p->color);
@@ -290,6 +287,23 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 	w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "indicator_label_checkbox"));
 
+
+	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);
 	gtk_spin_button_set_value(w_low_threshold, p->alarm_low_threshold);
@@ -323,6 +337,7 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
 	struct psensor **s_cur;
 	int i;
 	GtkTreePath *p;
+	GtkTreeSelection *sel;
 
 	p = NULL;
 	for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++)
@@ -332,9 +347,9 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
 		}
 
 	if (p) {
-		GtkTreeSelection *s = gtk_tree_view_get_selection(tree);
+		sel = gtk_tree_view_get_selection(tree);
 
-		gtk_tree_selection_select_path(s, p);
+		gtk_tree_selection_select_path(sel, p);
 		gtk_tree_path_free(p);
 	}
 }
@@ -442,7 +457,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 	if (!ok) {
 		log_printf(LOG_ERR, error->message);
 		g_error_free(error);
-		return ;
+		return;
 	}
 
 	w_sensors_list
@@ -482,7 +497,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 	if (result == GTK_RESPONSE_ACCEPT) {
 		apply_prefs(model, ui->config);
 		ui_sensorlist_update(ui, 1);
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
 		ui_appindicator_update_menu(ui);
 #endif
 	}