X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=c6325d8981954a63bd6a3c25a8ac40efd9191548;hb=b5a129a3038e7934677a35f67835226afc18b423;hp=91b7b1e08f2b46bd07bc849e3d6c338930838c0c;hpb=d5691e85f6c758624df014a2b4008d356518ba43;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 91b7b1e..c6325d8 100644
--- a/src/main.c
+++ b/src/main.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
@@ -37,6 +37,7 @@
 #include "ui_sensorlist.h"
 #include "ui_color.h"
 #include "lmsensor.h"
+#include "notify_cmd.h"
 #include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
@@ -68,8 +69,6 @@
 #include "cpu.h"
 #endif
 
-#include "compat.h"
-
 static const char *program_name;
 
 static void print_version()
@@ -81,7 +80,7 @@ static void print_version()
 		 "This is free software: you are free to change and "
 		 " redistribute it.\n"
 		 "There is NO WARRANTY, to the extent permitted by law.\n"),
-	       "2010-2012");
+	       "2010-2014");
 }
 
 static void print_help()
@@ -212,7 +211,7 @@ gboolean ui_refresh_thread(gpointer data)
 
 	graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
 
-	ui_sensorlist_update(ui);
+	ui_sensorlist_update(ui, 0);
 
 	if (is_appindicator_supported() || is_status_supported())
 		indicators_update(ui);
@@ -220,7 +219,7 @@ gboolean ui_refresh_thread(gpointer data)
 #ifdef HAVE_UNITY
 	ui_unity_launcher_entry_update(ui->sensors,
 				       !cfg->unity_launcher_count_disabled,
-				       cfg->temperature_unit == CELCIUS);
+				       cfg->temperature_unit == CELSIUS);
 #endif
 
 	if (ui->graph_update_interval != cfg->graph_update_interval) {
@@ -243,6 +242,8 @@ static void cb_alarm_raised(struct psensor *sensor, void *data)
 	if (sensor->alarm_enabled)
 		ui_notify(sensor, (struct ui_psensor *)data);
 #endif
+
+	notify_cmd(sensor);
 }
 
 static void associate_colors(struct psensor **sensors)
@@ -261,22 +262,17 @@ static void associate_colors(struct psensor **sensors)
 		{0x0000, 0x0000, 0x7fff},	/* dark blue */
 		{0x0000, 0x7fff, 0x0000}	/* dark green */
 	};
+	struct psensor **cur;
+	int i;
+	struct color c;
 
-	struct psensor **sensor_cur = sensors;
-	int i = 0;
-	while (*sensor_cur) {
-		struct color default_color;
-		color_set(&default_color,
+	for (cur = sensors, i = 0; *cur; cur++, i++) {
+		color_set(&c,
 			  colors[i % COLORS_COUNT][0],
 			  colors[i % COLORS_COUNT][1],
 			  colors[i % COLORS_COUNT][2]);
 
-		(*sensor_cur)->color
-		    = config_get_sensor_color((*sensor_cur)->id,
-					      &default_color);
-
-		sensor_cur++;
-		i++;
+		(*cur)->color = config_get_sensor_color((*cur)->id, &c);
 	}
 }
 
@@ -314,7 +310,7 @@ static void associate_preferences(struct psensor **sensors)
 		char *n;
 		struct psensor *s = *sensor_cur;
 
-		s->enabled = config_is_sensor_enabled(s->id);
+		s->graph_enabled = config_is_sensor_enabled(s->id);
 
 		n = config_get_sensor_name(s->id);
 
@@ -585,16 +581,9 @@ int main(int argc, char **argv)
 
 	/* main window */
 	ui_window_create(&ui);
-	ui.sensor_box = NULL;
-
-	/* drawing box */
-	ui.w_graph = ui_graph_create(&ui);
 
 	ui_enable_alpha_channel(&ui);
 
-	/* sensor list */
-	ui_sensorlist_create(&ui);
-
 	thread = g_thread_create((GThreadFunc) update_measures,
 				 &ui, TRUE, &error);
 
@@ -613,20 +602,26 @@ int main(int argc, char **argv)
 
 	/*
 	 * hack, did not find a cleaner solution.
-	 * wait 2s to ensure that the status icon is attempted to be
+	 * wait 30s to ensure that the status icon is attempted to be
 	 * drawn before determining whether the main window must be
 	 * show.
 	 */
-	g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui);
+	if  (ui.config->hide_on_startup)
+		g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+	else
+		initial_window_show(&ui);
 
 	/* main loop */
 	gtk_main();
 
-	g_object_ref(app);
+	g_object_unref(app);
 	cleanup(&ui);
 
 	log_debug("Quitting...");
 	log_close();
 
+	if (url)
+		free(url);
+
 	return 0;
 }