X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_pref.c;h=aae65560b22b788b72cd0fcc7facdd12b1b311cb;hb=f3b05dae619a7909bd7422b3a82422c9442aa114;hp=bbca2a8bc14255f667f3f45953dc3f3b5a25fdbe;hpb=b0fbaa0cc4cdc38bc86e3739e5bc78d73ca063ec;p=psensor.git

diff --git a/src/ui_pref.c b/src/ui_pref.c
index bbca2a8..aae6556 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.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
@@ -23,7 +23,6 @@
 #include "cfg.h"
 #include "ui_pref.h"
 #include "ui_color.h"
-#include "compat.h"
 
 GdkColor *color_to_gdkcolor(struct color *color)
 {
@@ -48,12 +47,14 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	GtkColorButton *w_color_fg, *w_color_bg;
 	GtkScale *w_bg_opacity;
 	GtkSpinButton *w_update_interval, *w_monitoring_duration,
-		*w_s_update_interval;
+		*w_s_update_interval, *w_slog_interval;
 	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;
+	GtkEntry *w_notif_script;
+	char *notif_script;
 
 	cfg = ui->config;
 
@@ -72,6 +73,14 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 
 	diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
 
+	w_notif_script = GTK_ENTRY(gtk_builder_get_object(builder,
+							  "notif_script"));
+	notif_script = config_get_notif_script();
+	if (notif_script) {
+		gtk_entry_set_text(GTK_ENTRY(w_notif_script), notif_script);
+		free(notif_script);
+	}
+
 	color_fg = color_to_gdkcolor(cfg->graph_fgcolor);
 	w_color_fg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
 							     "color_fg"));
@@ -126,6 +135,14 @@ 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_slog_interval = GTK_SPIN_BUTTON
+		(gtk_builder_get_object(builder, "slog_interval"));
+	gtk_spin_button_set_value(w_slog_interval, cfg->slog_interval);
+
 	w_hide_on_startup
 		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							   "hide_on_startup"));
@@ -149,7 +166,10 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 		double value;
 		GdkColor color;
 
-		g_mutex_lock(ui->sensors_mutex);
+		pthread_mutex_lock(&ui->sensors_mutex);
+
+		config_set_notif_script
+			(gtk_entry_get_text(GTK_ENTRY(w_notif_script)));
 
 		gtk_color_button_get_color(w_color_fg, &color);
 		color_set(cfg->graph_fgcolor,
@@ -209,12 +229,18 @@ 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->slog_interval
+			= gtk_spin_button_get_value_as_int(w_slog_interval);
+
 		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);
 	}