style

[psensor.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 85eb2d8..f4aa6ec 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -141,16 +141,18 @@ get_sensor_at_pos(GtkTreeView *view, int x, int y, struct ui_psensor *ui)
  */
 static int get_col_index_at_pos(GtkTreeView *view, int x)
 {
-       GList *columns = gtk_tree_view_get_columns(view);
-       GList *node;
-       int colx = 0;
-       int coli = 0;
-
-       for (node = columns; node; node = node->next) {
-               GtkTreeViewColumn *checkcol = (GtkTreeViewColumn *) node->data;
-
-               if (x >= colx &&
-                   x < (colx + gtk_tree_view_column_get_width(checkcol)))
+       GList *cols, *node;
+       int colx, coli;
+       GtkTreeViewColumn *checkcol;
+
+       cols = gtk_tree_view_get_columns(view);
+       colx = 0;
+       coli = 0;
+       for (node = cols; node; node = node->next) {
+               checkcol = (GtkTreeViewColumn *)node->data;
+
+               if (x >= colx
+                   && x < (colx + gtk_tree_view_column_get_width(checkcol)))
                        return coli;
                else
                        colx += gtk_tree_view_column_get_width(checkcol);
@@ -171,9 +173,7 @@ static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
 static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
                                      struct psensor *sensor)
 {
-       GtkWidget *menu;
-       GtkWidget *item;
-       GtkWidget *separator;
+       GtkWidget *menu, *item, *separator;
        struct cb_data *data;
 
        menu = gtk_menu_new();
@@ -203,32 +203,30 @@ static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
 static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        GtkWidget *menu;
-       struct ui_psensor *ui = (struct ui_psensor *)data;
+       struct ui_psensor *ui;
        GtkTreeView *view;
+       struct psensor *s;
+       int coli;
 
        if (event->button != 3)
                return FALSE;
 
+       ui = (struct ui_psensor *)data;
        view = ui->sensors_tree;
 
-       struct psensor *sensor = get_sensor_at_pos(view,
-                                                  event->x,
-                                                  event->y,
-                                                  ui);
+       s = get_sensor_at_pos(view, event->x, event->y, ui);
 
-       if (sensor) {
-               int coli = col_index_to_col(get_col_index_at_pos(view,
-                                                                event->x));
+       if (s) {
+               coli = col_index_to_col(get_col_index_at_pos(view, event->x));
 
                if (coli == COL_COLOR) {
                        if (ui_change_color(_("Select foreground color"),
-                                           sensor->color)) {
+                                           s->color)) {
                                ui_sensorlist_update(ui, 1);
-                               config_set_sensor_color(sensor->id,
-                                                       sensor->color);
+                               config_set_sensor_color(s->id, s->color);
                        }
                } else if (coli >= 0 && coli != COL_ENABLED) {
-                       menu = create_sensor_popup(ui, sensor);
+                       menu = create_sensor_popup(ui, s);
 
                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
                                       event->button, event->time);
@@ -245,7 +243,6 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
        GtkTreeModel *model;
        GtkTreeIter iter;
        GtkTreePath *path;
-       gboolean fixed;
        struct psensor *s;
 
        ui = (struct ui_psensor *)data;
@@ -255,11 +252,8 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
        gtk_tree_model_get_iter(model, &iter, path);
 
        gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
-       gtk_tree_model_get(model, &iter, COL_ENABLED, &fixed, -1);
 
-       fixed ^= 1;
-
-       s->enabled = fixed;
+       s->enabled ^= 1;
        config_set_sensor_enabled(s->id, s->enabled);
 
        gtk_list_store_set(GTK_LIST_STORE(model), &iter,
@@ -282,7 +276,7 @@ static int cmp_sensors(const void *p1, const void *p2)
        return pos1 - pos2;
 }
 
-static void create_widget(struct ui_psensor *ui)
+void ui_sensorlist_create(struct ui_psensor *ui)
 {
        GtkListStore *store;
        GtkCellRenderer *renderer;
@@ -290,6 +284,8 @@ static void create_widget(struct ui_psensor *ui)
        GtkTreeIter iter;
        struct psensor **ordered_sensors;
 
+       log_debug("ui_sensorlist_create()");
+
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
@@ -355,12 +351,7 @@ static void create_widget(struct ui_psensor *ui)
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter, COL_SENSOR, *s_cur, -1);
        }
+       free(ordered_sensors);
 
        ui_sensorlist_update(ui, 1);
 }
-
-void ui_sensorlist_create(struct ui_psensor *ui)
-{
-       log_debug("ui_sensorlist_create()");
-       create_widget(ui);
-}