avoid to shadow var

[psensor.git] / src / ui_sensorpref.c

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 76a90ea..e71492c 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -27,9 +27,8 @@
 #include <ui_sensorpref.h>
 #include <ui_color.h>
 
-
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
-#include "ui_appindicator.h"
+#if defined(HAVE_APPINDICATOR)
+#include <ui_appindicator.h>
 #endif
 
 enum {
@@ -291,7 +290,7 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
                (gtk_builder_get_object(builder, "indicator_label_checkbox"));
 
 
-#if !HAVE_APPINDICATOR && !HAVE_APPINDICATOR_029
+#if !HAVE_APPINDICATOR
        gtk_widget_set_sensitive(GTK_WIDGET(w_appindicator_label_enabled),
                                 FALSE);
        gtk_widget_set_sensitive(GTK_WIDGET(w_appindicator_enabled), FALSE);
@@ -337,6 +336,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++)
@@ -346,9 +346,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);
        }
 }
@@ -496,7 +496,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
        }