X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=cbb598682fd57b3135e1707c01c5e2000f5c5baf;hb=48739caa745f9f8002e87af574f03e5dc6ae3447;hp=a883be63b1bc4d66b29e49554152ac979d60c059;hpb=f73aa2047e162f171d9bfc39ddd11406bec3ace8;p=psensor.git

diff --git a/src/ui_pref.c b/src/ui_pref.c
index a883be6..cbb5986 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -50,6 +50,21 @@ void ui_pref_temperature_unit_changed_cbk(GtkComboBox *combo, gpointer data)
 	config_set_temperature_unit(gtk_combo_box_get_active(combo));
 }
 
+void ui_pref_menu_toggled_cbk(GtkToggleButton *btn, gpointer data)
+{
+	config_set_menu_bar_enabled(gtk_toggle_button_get_active(btn));
+}
+
+void ui_pref_count_visible_toggled_cbk(GtkToggleButton *btn, gpointer data)
+{
+	config_set_count_visible(gtk_toggle_button_get_active(btn));
+}
+
+void ui_pref_sensorlist_position_changed_cbk(GtkComboBox *combo, gpointer data)
+{
+	config_set_sensorlist_position(gtk_combo_box_get_active(combo));
+}
+
 GdkRGBA color_to_GdkRGBA(struct color *color)
 {
 	GdkRGBA c;
@@ -153,7 +168,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 	w_sensorlist_pos = GTK_COMBO_BOX
 		(gtk_builder_get_object(builder, "sensors_list_position"));
-	gtk_combo_box_set_active(w_sensorlist_pos, cfg->sensorlist_position);
+	gtk_combo_box_set_active(w_sensorlist_pos,
+				 config_get_sensorlist_position());
 
 	w_autostart = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "autostart"));
@@ -161,12 +177,13 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 	w_enable_menu = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "enable_menu"));
-	gtk_toggle_button_set_active(w_enable_menu, !cfg->menu_bar_disabled);
+	gtk_toggle_button_set_active(w_enable_menu,
+				     config_is_menu_bar_enabled());
 
 	w_enable_launcher_counter = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "enable_launcher_counter"));
 	gtk_toggle_button_set_active(w_enable_launcher_counter,
-				     !cfg->unity_launcher_count_disabled);
+				     !config_is_count_visible());
 
 	if (ui_unity_is_supported()) {
 		gtk_widget_set_has_tooltip
@@ -326,16 +343,6 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 		else
 			cfg->alpha_channel_enabled = 1;
 
-		cfg->sensorlist_position
-			= gtk_combo_box_get_active(w_sensorlist_pos);
-
-		cfg->menu_bar_disabled
-			= !gtk_toggle_button_get_active(w_enable_menu);
-
-		cfg->unity_launcher_count_disabled
-			= !gtk_toggle_button_get_active
-			(w_enable_launcher_counter);
-
 		cfg->sensor_update_interval
 			= gtk_spin_button_get_value_as_int(w_s_update_interval);