X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=05bf8c754ef4029aad518187bbc668448a03e2e0;hb=71f8a259e8a619d0834b4de3769ceb47f32c104c;hp=0d7649f5f5d48f9f697696bf22637d37b7cfb6d6;hpb=b0fbaa0cc4cdc38bc86e3739e5bc78d73ca063ec;p=psensor.git diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index 0d7649f..05bf8c7 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2014 jeanfi@gmail.com * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -20,285 +20,239 @@ #include -#include "cfg.h" -#include "ui_pref.h" -#include "ui_sensorlist.h" -#include "ui_sensorpref.h" -#include "ui_color.h" - -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) -#include "ui_appindicator.h" -#endif - -struct sensor_pref { - struct psensor *sensor; - char *name; - int enabled; - struct color *color; - int alarm_enabled; - int alarm_high_threshold; - int alarm_low_threshold; - unsigned int appindicator_enabled; +#include +#include +#include +#include +#include +#include +#include + +enum { + COL_NAME = 0, + COL_SENSOR_PREF }; struct cb_data { struct ui_psensor *ui; GtkBuilder *builder; - struct sensor_pref **prefs; }; -static struct sensor_pref *sensor_pref_new(struct psensor *s, - struct config *cfg) +static struct psensor *get_selected_sensor(GtkBuilder *builder) { - struct sensor_pref *p; - - p = malloc(sizeof(struct sensor_pref)); + GtkTreeModel *model; + GtkTreeIter iter; + struct psensor *s; + GtkTreeSelection *selection; + GtkTreeView *tree; - p->sensor = s; - p->name = strdup(s->name); - p->enabled = s->enabled; - p->alarm_enabled = s->alarm_enabled; - p->color = color_dup(s->color); + tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "sensors_list")); - if (cfg->temperature_unit == CELCIUS) { - p->alarm_high_threshold = s->alarm_high_threshold; - p->alarm_low_threshold = s->alarm_low_threshold; - } else { - p->alarm_high_threshold - = celcius_to_fahrenheit(s->alarm_high_threshold); - p->alarm_low_threshold - = celcius_to_fahrenheit(s->alarm_low_threshold); - } + selection = gtk_tree_view_get_selection(tree); - p->appindicator_enabled = s->appindicator_enabled; + s = NULL; + if (gtk_tree_selection_get_selected(selection, &model, &iter)) + gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &s, -1); - return p; + return s; } -static void sensor_pref_free(struct sensor_pref *p) +static void apply_config(struct ui_psensor *ui) { - if (!p) - return ; - - free(p->name); - free(p->color); + config_sync(); - free(p); + ui_sensorlist_update(ui, 1); + ui_appindicator_update_menu(ui); } -static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors, - struct config *cfg) +void ui_sensorpref_name_changed_cb(GtkEntry *entry, gpointer data) { - int n, i; - struct sensor_pref **pref_list; + struct psensor *s; + struct cb_data *cbdata; - n = psensor_list_size(sensors); - pref_list = malloc(sizeof(struct sensor_pref *) * (n+1)); + const gchar *str; - for (i = 0; i < n; i++) - pref_list[i] = sensor_pref_new(sensors[i], - cfg); + cbdata = (struct cb_data *)data; - pref_list[n] = NULL; + s = get_selected_sensor(cbdata->builder); - return pref_list; -} - -static void sensor_pref_list_free(struct sensor_pref **list) -{ - struct sensor_pref **cur = list; + str = gtk_entry_get_text(entry); - while (*cur) { - sensor_pref_free(*cur); + if (s) { + if (strcmp(str, s->name)) { + free(s->name); + s->name = strdup(str); + config_set_sensor_name(s->id, str); - cur++; + apply_config(cbdata->ui); + } } - - free(list); } -static struct sensor_pref * -sensor_pref_get(struct sensor_pref **ps, struct psensor *s) +void ui_sensorpref_draw_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct sensor_pref **p_cur = ps; + gboolean active; + struct cb_data *cbdata; + struct psensor *s; - while (*p_cur) { - struct sensor_pref *p = *p_cur; + cbdata = (struct cb_data *)data; - if (p->sensor == s) - return p; + s = get_selected_sensor(cbdata->builder); + if (s) { + active = gtk_toggle_button_get_active(btn); + config_set_sensor_graph_enabled(s->id, active); - p_cur++; + apply_config(cbdata->ui); } - - return NULL; } -static struct sensor_pref * -get_selected_sensor_pref(GtkBuilder *builder, struct sensor_pref **ps) +void ui_sensorpref_display_toggled_cb(GtkToggleButton *btn, gpointer data) { - GtkTreeModel *model; - GtkTreeIter iter; - struct sensor_pref *pref = NULL; - GtkTreeSelection *selection; - GtkTreeView *tree; + gboolean active; + struct cb_data *cbdata; + struct psensor *s; - tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, - "sensors_list")); + cbdata = (struct cb_data *)data; - selection = gtk_tree_view_get_selection(tree); + s = get_selected_sensor(cbdata->builder); - if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - GtkTreePath *p = gtk_tree_model_get_path(model, &iter); - gint *indices = gtk_tree_path_get_indices(p); + if (s) { + active = gtk_toggle_button_get_active(btn); + config_set_sensor_enabled(s->id, active); - pref = ps[*indices]; - - gtk_tree_path_free(p); + apply_config(cbdata->ui); } - return pref; } -static void on_name_changed(GtkEntry *entry, gpointer data) +void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct cb_data *cbdata = data; - struct sensor_pref *p; - const char *str; + gboolean active; + struct cb_data *cbdata; + struct psensor *s; - str = gtk_entry_get_text(entry); + cbdata = (struct cb_data *)data; - p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + s = get_selected_sensor(cbdata->builder); - if (p && strcmp(p->name, str)) { - free(p->name); - p->name = strdup(str); + if (s) { + active = gtk_toggle_button_get_active(btn); + config_set_sensor_alarm_enabled(s->id, active); + + apply_config(cbdata->ui); } } -static void -on_drawed_toggled(GtkToggleButton *btn, gpointer data) +void +ui_sensorpref_appindicator_menu_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct cb_data *cbdata = data; - struct sensor_pref *p; - - p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + gboolean active; + struct cb_data *cbdata; + struct psensor *s; - if (p) - p->enabled = gtk_toggle_button_get_active(btn); -} + cbdata = (struct cb_data *)data; -static void -on_alarm_toggled(GtkToggleButton *btn, gpointer data) -{ - struct cb_data *cbdata = data; - struct sensor_pref *p; + s = get_selected_sensor(cbdata->builder); - p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + if (s) { + active = gtk_toggle_button_get_active(btn); + config_set_appindicator_enabled(s->id, active); - if (p) - p->alarm_enabled = gtk_toggle_button_get_active(btn); + apply_config(cbdata->ui); + } } -static void -on_appindicator_toggled(GtkToggleButton *btn, gpointer data) +void +ui_sensorpref_appindicator_label_toggled_cb(GtkToggleButton *btn, gpointer data) { - struct cb_data *cbdata = data; - struct sensor_pref *p; + gboolean active; + struct cb_data *cbdata; + struct psensor *s; + + cbdata = (struct cb_data *)data; - p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + s = get_selected_sensor(cbdata->builder); - if (p) - p->appindicator_enabled = gtk_toggle_button_get_active(btn); + if (s) { + active = gtk_toggle_button_get_active(btn); + config_set_appindicator_label_enabled(s->id, active); + + apply_config(cbdata->ui); + } } -static void on_color_set(GtkColorButton *widget, gpointer data) +void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data) { - struct cb_data *cbdata = data; - struct sensor_pref *p; - GdkColor color; + struct cb_data *cbdata; + struct psensor *s; + GdkRGBA color; - p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + cbdata = (struct cb_data *)data; - if (p) { - gtk_color_button_get_color(widget, &color); - color_set(p->color, color.red, color.green, color.blue); + s = get_selected_sensor(cbdata->builder); + + if (s) { + gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color); + config_set_sensor_color(s->id, &color); + + apply_config(cbdata->ui); } } -static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data) +void +ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *btn, gpointer data) { struct cb_data *cbdata; - struct sensor_pref *p; + struct psensor *s; + gdouble v; + + cbdata = (struct cb_data *)data; - cbdata = data; + s = get_selected_sensor(cbdata->builder); - p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + if (s) { + v = gtk_spin_button_get_value(btn); + config_set_sensor_alarm_high_threshold(s->id, v); - if (p) - p->alarm_high_threshold = gtk_spin_button_get_value(btn); + apply_config(cbdata->ui); + + s->alarm_high_threshold = v; + } } -static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data) +void +ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data) { struct cb_data *cbdata; - struct sensor_pref *p; + struct psensor *s; + gdouble v; - cbdata = data; + cbdata = (struct cb_data *)data; - p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); + s = get_selected_sensor(cbdata->builder); - if (p) - p->alarm_low_threshold = gtk_spin_button_get_value(btn); -} + if (s) { + v = gtk_spin_button_get_value(btn); + config_set_sensor_alarm_low_threshold(s->id, v); -static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) -{ - g_signal_connect(gtk_builder_get_object(builder, "sensor_name"), - "changed", G_CALLBACK(on_name_changed), cbdata); - - g_signal_connect(gtk_builder_get_object(builder, "sensor_draw"), - "toggled", G_CALLBACK(on_drawed_toggled), cbdata); - - g_signal_connect(gtk_builder_get_object(builder, "sensor_color"), - "color-set", G_CALLBACK(on_color_set), cbdata); - - g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"), - "toggled", G_CALLBACK(on_alarm_toggled), cbdata); - - g_signal_connect(gtk_builder_get_object(builder, - "sensor_alarm_high_threshold"), - "value-changed", - G_CALLBACK(on_alarm_high_threshold_changed), - cbdata); - - g_signal_connect(gtk_builder_get_object(builder, - "sensor_alarm_low_threshold"), - "value-changed", - G_CALLBACK(on_alarm_low_threshold_changed), - cbdata); - - g_signal_connect(gtk_builder_get_object(builder, - "indicator_checkbox"), - "toggled", - G_CALLBACK(on_appindicator_toggled), - cbdata); + apply_config(cbdata->ui); + + s->alarm_low_threshold = v; + } } static void -update_pref(struct psensor *s, - struct sensor_pref **prefs, - struct config *cfg, - GtkBuilder *builder) +update_pref(struct psensor *s, struct config *cfg, GtkBuilder *builder) { - GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit; + GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit, + *w_chipname; GtkEntry *w_name; - GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled; + GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled, + *w_appindicator_label_enabled, *w_display; GtkColorButton *w_color; GtkSpinButton *w_high_threshold, *w_low_threshold; - GdkColor *color; - struct sensor_pref *p = sensor_pref_get(prefs, s); - int use_celcius; + int use_celsius, threshold; + GdkRGBA *color; w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id")); gtk_label_set_text(w_id, s->id); @@ -307,16 +261,30 @@ update_pref(struct psensor *s, gtk_label_set_text(w_type, psensor_type_to_str(s->type)); w_name = GTK_ENTRY(gtk_builder_get_object(builder, "sensor_name")); - gtk_entry_set_text(w_name, p->name); + gtk_entry_set_text(w_name, s->name); + + w_chipname = GTK_LABEL(gtk_builder_get_object(builder, "chip_name")); + if (s->chip) + gtk_label_set_text(w_chipname, s->chip); + else + gtk_label_set_text(w_chipname, _("Unknown")); w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_draw")); - gtk_toggle_button_set_active(w_draw, p->enabled); + gtk_toggle_button_set_active(w_draw, + config_is_sensor_graph_enabled(s->id)); + + w_display = GTK_TOGGLE_BUTTON(gtk_builder_get_object + (builder, + "sensor_enable_checkbox")); + gtk_toggle_button_set_active(w_display, + config_is_sensor_enabled(s->id)); - color = color_to_gdkcolor(p->color); w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder, "sensor_color")); - gtk_color_button_set_color(w_color, color); + color = config_get_sensor_color(s->id); + gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), color); + gdk_rgba_free(color); w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_alarm")); @@ -334,164 +302,111 @@ update_pref(struct psensor *s, (builder, "sensor_alarm_low_threshold_unit")); - use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0; + use_celsius = cfg->temperature_unit == CELSIUS ? 1 : 0; gtk_label_set_text(w_high_threshold_unit, - psensor_type_to_unit_str(s->type, - use_celcius)); + psensor_type_to_unit_str(s->type, use_celsius)); gtk_label_set_text(w_low_threshold_unit, - psensor_type_to_unit_str(s->type, - use_celcius)); + psensor_type_to_unit_str(s->type, use_celsius)); w_appindicator_enabled = GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "indicator_checkbox")); - - if (is_temp_type(s->type) || is_fan_type(s->type)) { - gtk_toggle_button_set_active(w_alarm, p->alarm_enabled); - gtk_spin_button_set_value(w_high_threshold, - p->alarm_high_threshold); - gtk_spin_button_set_value(w_low_threshold, - p->alarm_low_threshold); - gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE); - gtk_toggle_button_set_active(w_appindicator_enabled, - p->appindicator_enabled); + w_appindicator_label_enabled = GTK_TOGGLE_BUTTON + (gtk_builder_get_object(builder, "indicator_label_checkbox")); + + if (is_appindicator_supported()) { + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_label_enabled), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_enabled), FALSE); } else { - gtk_toggle_button_set_active(w_alarm, 0); - gtk_spin_button_set_value(w_high_threshold, 0); - gtk_spin_button_set_value(w_low_threshold, 0); - gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), FALSE); - gtk_toggle_button_set_active(w_appindicator_enabled, - !p->appindicator_enabled); + gtk_widget_set_sensitive + (GTK_WIDGET(w_appindicator_label_enabled), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_label_enabled), TRUE); + gtk_widget_set_sensitive + (GTK_WIDGET(w_appindicator_enabled), FALSE); + gtk_widget_set_has_tooltip + (GTK_WIDGET(w_appindicator_enabled), TRUE); } + + gtk_toggle_button_set_active(w_alarm, + config_get_sensor_alarm_enabled(s->id)); + + threshold = config_get_sensor_alarm_high_threshold(s->id); + if (!use_celsius) + threshold = celsius_to_fahrenheit(threshold); + gtk_spin_button_set_value(w_high_threshold, threshold); + + threshold = config_get_sensor_alarm_low_threshold(s->id); + if (!use_celsius) + threshold = celsius_to_fahrenheit(threshold); + gtk_spin_button_set_value(w_low_threshold, threshold); + + gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), TRUE); + gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE); + + gtk_toggle_button_set_active(w_appindicator_enabled, + config_is_appindicator_enabled(s->id)); + + gtk_toggle_button_set_active + (w_appindicator_label_enabled, + config_is_appindicator_label_enabled(s->id)); } static void on_changed(GtkTreeSelection *selection, gpointer data) { - GtkTreeModel *model; - GtkTreeIter iter; struct cb_data *cbdata = data; struct ui_psensor *ui = cbdata->ui; + struct psensor *s; - if (gtk_tree_selection_get_selected(selection, &model, &iter)) { - GtkTreePath *p = gtk_tree_model_get_path(model, &iter); - gint *indices = gtk_tree_path_get_indices(p); - struct psensor *s = *(ui->sensors + *indices); + s = get_selected_sensor(cbdata->builder); - update_pref(s, - cbdata->prefs, - ui->config, - cbdata->builder); - - gtk_tree_path_free(p); - } + update_pref(s, ui->config, cbdata->builder); } 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; + GtkTreeSelection *sel; - 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); + sel = gtk_tree_view_get_selection(tree); - gtk_tree_selection_select_path(s, p); + gtk_tree_selection_select_path(sel, p); gtk_tree_path_free(p); } } -static void -apply_prefs(struct sensor_pref **prefs, - struct psensor **sensors, - struct config *cfg) -{ - int n = psensor_list_size(sensors); - int i; - - for (i = 0; i < n; i++) { - struct psensor *s = sensors[i]; - struct sensor_pref *p = prefs[i]; - - if (strcmp(p->name, s->name)) { - free(s->name); - s->name = strdup(p->name); - config_set_sensor_name(s->id, s->name); - } - - if (s->enabled != p->enabled) { - s->enabled = p->enabled; - config_set_sensor_enabled(s->id, s->enabled); - } - - if (is_temp_type(s->type) - && cfg->temperature_unit == FAHRENHEIT) { - s->alarm_high_threshold = fahrenheit_to_celcius - (p->alarm_high_threshold); - s->alarm_low_threshold = fahrenheit_to_celcius - (p->alarm_low_threshold); - } else { - s->alarm_high_threshold = p->alarm_high_threshold; - s->alarm_low_threshold = p->alarm_low_threshold; - } - - config_set_sensor_alarm_high_threshold(s->id, - s->alarm_high_threshold); - config_set_sensor_alarm_low_threshold(s->id, - s->alarm_low_threshold); - - if (s->alarm_enabled != p->alarm_enabled) { - s->alarm_enabled = p->alarm_enabled; - config_set_sensor_alarm_enabled(s->id, - s->alarm_enabled); - } - - color_set(s->color, - p->color->red, p->color->green, p->color->blue); - config_set_sensor_color(s->id, s->color); - - if (s->appindicator_enabled != p->appindicator_enabled) { - s->appindicator_enabled = p->appindicator_enabled; - config_set_appindicator_enabled - (s->id, s->appindicator_enabled); - } - } -} - void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) { GtkDialog *diag; - gint result; + guint ok; GtkBuilder *builder; - GError *error = NULL; + GError *error; GtkTreeView *w_sensors_list; - guint ok; - GtkCellRenderer *renderer; GtkListStore *store; - struct psensor **s_cur; + struct psensor **s_cur, *s, **ordered_sensors; GtkTreeSelection *selection; struct cb_data cbdata; + GtkTreeIter iter; cbdata.ui = ui; - cbdata.prefs = sensor_pref_list_new(ui->sensors, - ui->config); builder = gtk_builder_new(); cbdata.builder = builder; + error = NULL; ok = gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade", @@ -500,54 +415,43 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui) if (!ok) { log_printf(LOG_ERR, error->message); g_error_free(error); - return ; + return; } - update_pref(sensor, cbdata.prefs, ui->config, builder); - connect_signals(builder, &cbdata); - w_sensors_list = GTK_TREE_VIEW(gtk_builder_get_object(builder, "sensors_list")); - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(w_sensors_list, - -1, - _("Sensor Name"), - renderer, - "text", 0, NULL); - - store = GTK_LIST_STORE(gtk_tree_view_get_model(w_sensors_list)); - - s_cur = ui->sensors; - while (*s_cur) { - GtkTreeIter iter; - struct psensor *s = *s_cur; + store = GTK_LIST_STORE(gtk_builder_get_object(builder, + "sensors_liststore")); + ordered_sensors = ui_get_sensors_ordered_by_position(ui); + for (s_cur = ordered_sensors; *s_cur; s_cur++) { + s = *s_cur; gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, 0, s->name, -1); - s_cur++; + gtk_list_store_set(store, &iter, + COL_NAME, s->name, + COL_SENSOR_PREF, s, + -1); + + if (s == sensor) + update_pref(s, ui->config, builder); } selection = gtk_tree_view_get_selection(w_sensors_list); g_signal_connect(selection, "changed", G_CALLBACK(on_changed), &cbdata); - select_sensor(sensor, ui->sensors, w_sensors_list); + select_sensor(sensor, ordered_sensors, w_sensors_list); + + free(ordered_sensors); diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1")); - result = gtk_dialog_run(diag); - - if (result == GTK_RESPONSE_ACCEPT) { - apply_prefs(cbdata.prefs, ui->sensors, ui->config); - ui_sensorlist_update_sensors_preferences(ui); -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) - ui_appindicator_update_menu(ui); -#endif - } + + gtk_builder_connect_signals(builder, &cbdata); + + gtk_dialog_run(diag); g_object_unref(G_OBJECT(builder)); gtk_widget_destroy(GTK_WIDGET(diag)); - - sensor_pref_list_free(cbdata.prefs); }