enum {
COL_NAME = 0,
- COL_SENSOR
+ COL_SENSOR_PREF
};
struct sensor_pref {
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;
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;
}
}
}
-static void
-on_drawed_toggled(GtkToggleButton *btn, gpointer data)
+static void on_drawed_toggled(GtkToggleButton *btn, gpointer data)
{
struct sensor_pref *p;
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;
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;
gtk_toggle_button_set_active(w_appindicator_enabled,
p->appindicator_enabled);
-
}
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);
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;
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++;
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)
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);
}