X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=1b7ee162c251e2a5449e7ae32c001fef274db10f;hb=920b0beeceeb7bc3892d15796956b9c6fe3824a0;hp=5afd2877f50e49482b617d23c4c2b94123fe8fee;hpb=9f0c3025507e5ab7cf1b5346b5cb0e0a56f01249;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 5afd287..1b7ee16 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -32,7 +32,7 @@
 
 enum {
 	COL_NAME = 0,
-	COL_SENSOR
+	COL_SENSOR_PREF
 };
 
 struct sensor_pref {
@@ -90,8 +90,7 @@ static void sensor_pref_free(struct sensor_pref *p)
 	free(p);
 }
 
-static struct sensor_pref *
-get_selected_sensor_pref(GtkTreeView *tree)
+static struct sensor_pref *get_selected_sensor_pref(GtkTreeView *tree)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
@@ -102,7 +101,7 @@ get_selected_sensor_pref(GtkTreeView *tree)
 
 	pref = NULL;
 	if (gtk_tree_selection_get_selected(selection, &model, &iter))
-		gtk_tree_model_get(model, &iter, COL_SENSOR, &pref, -1);
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &pref, -1);
 
 	return pref;
 }
@@ -122,8 +121,7 @@ static void on_name_changed(GtkEntry *entry, gpointer data)
 	}
 }
 
-static void
-on_drawed_toggled(GtkToggleButton *btn, gpointer data)
+static void on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -133,8 +131,7 @@ on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 		p->enabled = gtk_toggle_button_get_active(btn);
 }
 
-static void
-on_alarm_toggled(GtkToggleButton *btn, gpointer data)
+static void on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -144,8 +141,7 @@ on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 		p->alarm_enabled = gtk_toggle_button_get_active(btn);
 }
 
-static void
-on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
+static void on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
 {
 	struct sensor_pref *p;
 
@@ -307,7 +303,6 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 
 	gtk_toggle_button_set_active(w_appindicator_enabled,
 				     p->appindicator_enabled);
-
 }
 
 static void on_changed(GtkTreeSelection *selection, gpointer data)
@@ -326,20 +321,17 @@ static void on_changed(GtkTreeSelection *selection, gpointer data)
 static void
 select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
 {
-	struct psensor **s_cur = sensors;
-	int i = 0;
-	GtkTreePath *p = NULL;
+	struct psensor **s_cur;
+	int i;
+	GtkTreePath *p;
 
-	while (*s_cur) {
+	p = NULL;
+	for (s_cur = sensors, i = 0; *s_cur; s_cur++, i++)
 		if (s == *s_cur) {
 			p = gtk_tree_path_new_from_indices(i, -1);
 			break;
 		}
 
-		i++;
-		s_cur++;
-	}
-
 	if (p) {
 		GtkTreeSelection *s = gtk_tree_view_get_selection(tree);
 
@@ -394,8 +386,7 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 	config_set_sensor_position(s->id, pos);
 }
 
-static void
-apply_prefs(GtkTreeModel *model, struct config *cfg)
+static void apply_prefs(GtkTreeModel *model, struct config *cfg)
 {
 	gboolean valid;
 	struct sensor_pref *spref;
@@ -405,7 +396,7 @@ apply_prefs(GtkTreeModel *model, struct config *cfg)
 	valid = gtk_tree_model_get_iter_first(model, &iter);
 	i = 0;
 	while (valid) {
-		gtk_tree_model_get(model, &iter, COL_SENSOR, &spref, -1);
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
 		apply_pref(spref, i, cfg);
 		valid = gtk_tree_model_iter_next(model, &iter);
 		i++;
@@ -462,7 +453,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		spref = sensor_pref_new(s, ui->config);
 		gtk_list_store_set(store, &iter,
 				   COL_NAME, s->name,
-				   COL_SENSOR, spref,
+				   COL_SENSOR_PREF, spref,
 				   -1);
 
 		if (s == sensor)
@@ -490,7 +481,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 
 	valid = gtk_tree_model_get_iter_first(model, &iter);
 	while (valid) {
-		gtk_tree_model_get(model, &iter, COL_SENSOR, &spref, -1);
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
 		sensor_pref_free(spref);
 		valid = gtk_tree_model_iter_next(model, &iter);
 	}