prepare release 0.7.0.4

[psensor.git] / src / ui_pref.c

diff --git a/src/ui_pref.c b/src/ui_pref.c
index 8005e04..c4d7264 100644 (file)
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -52,7 +52,8 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
        GtkComboBox *w_sensorlist_pos;
        GtkToggleButton *w_hide_window_decoration, *w_keep_window_below,
                *w_enable_menu, *w_enable_launcher_counter, *w_hide_on_startup,
-               *w_win_restore;
+               *w_win_restore, *w_slog_enabled;
+       GtkComboBoxText *w_temp_unit;
 
        cfg = ui->config;
 
@@ -125,6 +126,10 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
        gtk_toggle_button_set_active(w_enable_launcher_counter,
                                     !cfg->unity_launcher_count_disabled);
 
+       w_slog_enabled = GTK_TOGGLE_BUTTON
+               (gtk_builder_get_object(builder, "enable_slog"));
+       gtk_toggle_button_set_active(w_slog_enabled, cfg->slog_enabled);
+
        w_hide_on_startup
                = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
                                                           "hide_on_startup"));
@@ -136,13 +141,19 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
        gtk_toggle_button_set_active(w_win_restore,
                                     cfg->window_restore_enabled);
 
+       w_temp_unit
+               = GTK_COMBO_BOX_TEXT(gtk_builder_get_object
+                                    (builder, "temperature_unit"));
+       gtk_combo_box_set_active(GTK_COMBO_BOX(w_temp_unit),
+                                cfg->temperature_unit);
+
        result = gtk_dialog_run(diag);
 
        if (result == GTK_RESPONSE_ACCEPT) {
                double value;
                GdkColor color;
 
-               g_mutex_lock(ui->sensors_mutex);
+               pthread_mutex_lock(&ui->sensors_mutex);
 
                gtk_color_button_get_color(w_color_fg, &color);
                color_set(cfg->graph_fgcolor,
@@ -202,9 +213,15 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
                cfg->window_restore_enabled
                        = gtk_toggle_button_get_active(w_win_restore);
 
+               cfg->slog_enabled
+                       = gtk_toggle_button_get_active(w_slog_enabled);
+
+               cfg->temperature_unit
+                       = gtk_combo_box_get_active(GTK_COMBO_BOX(w_temp_unit));
+
                config_save(cfg);
 
-               g_mutex_unlock(ui->sensors_mutex);
+               pthread_mutex_unlock(&ui->sensors_mutex);
 
                ui_window_update(ui);
        }