style

[psensor.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 3a9e988..1933002 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);
@@ -161,15 +163,15 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
        return -1;
 }
 
-static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
+static void preferences_activated_cbk(GtkWidget *menu_item, gpointer data)
 {
        struct cb_data *cb_data = data;
 
        ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui);
 }
 
-static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
-                                     struct psensor *sensor)
+static GtkWidget *
+create_sensor_popup(struct ui_psensor *ui, struct psensor *sensor)
 {
        GtkWidget *menu, *item, *separator;
        struct cb_data *data;
@@ -191,14 +193,14 @@ static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
 
        g_signal_connect(item,
                         "activate",
-                        G_CALLBACK(on_preferences_activated), data);
+                        G_CALLBACK(preferences_activated_cbk), data);
 
        gtk_widget_show_all(menu);
 
        return menu;
 }
 
-static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        GtkWidget *menu;
        struct ui_psensor *ui;
@@ -319,7 +321,7 @@ void ui_sensorlist_create(struct ui_psensor *ui)
                                                    NULL);
 
        g_signal_connect(ui->sensors_tree,
-                        "button-press-event", (GCallback) on_clicked, ui);
+                        "button-press-event", (GCallback)clicked_cbk, ui);
 
        renderer = gtk_cell_renderer_toggle_new();
        gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,