removed useless var

[psensor.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 033c96a..59d9d79 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -64,15 +64,12 @@ void ui_sensorlist_update(struct ui_psensor *ui)
        GtkTreeModel *model
            = gtk_tree_view_get_model(ui_sl->treeview);
        gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
-       struct psensor **sensor = ui->sensors;
        int use_celcius;
 
        use_celcius = ui->config->temperature_unit == CELCIUS;
 
        while (valid) {
-               gtk_tree_model_get(model, &iter, 
-                                  COL_SENSOR, &s, 
-                                  -1);
+               gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
 
                str = psensor_value_to_str(s->type,
                                           s->measures[s->values_max_length -
@@ -94,7 +91,6 @@ void ui_sensorlist_update(struct ui_psensor *ui)
                free(str);
 
                valid = gtk_tree_model_iter_next(model, &iter);
-               sensor++;
        }
 }
 
@@ -226,6 +222,9 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
        struct ui_psensor *ui = (struct ui_psensor *)data;
        GtkTreeView *view = ui->ui_sensorlist->treeview;
 
+       if (event->button != 3)
+               return FALSE;
+
        struct psensor *sensor = get_sensor_at_pos(view,
                                                   event->x,
                                                   event->y,
@@ -242,8 +241,7 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
                                config_set_sensor_color(sensor->id,
                                                        sensor->color);
                        }
-               } else if (coli >= 0 && coli != COL_ENABLED
-                          && event->button == 3) {
+               } else if (coli >= 0 && coli != COL_ENABLED) {
                        menu = create_sensor_popup(ui, sensor);
 
                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
@@ -252,7 +250,7 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
                }
 
        }
-       return FALSE;
+       return TRUE;
 }
 
 static void