X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=67c1d6a7b783a7c08f185dfbba42b28e0f3a2457;hb=27a60885389b016ac4087b3988ff3c45a19f7b8e;hp=134385d3d56c9b7cfa6c2a52b4c537e5d661a1a3;hpb=507414dd1faeacc0737616a4834ce9643b98c2ea;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 134385d..67c1d6a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 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
@@ -68,8 +68,6 @@
 #include "cpu.h"
 #endif
 
-#include "compat.h"
-
 static const char *program_name;
 
 static void print_version()
@@ -81,7 +79,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-2013");
 }
 
 static void print_help()
@@ -145,7 +143,7 @@ static void update_measures(struct ui_psensor *ui)
 	cfg = ui->config;
 
 	while (1) {
-		g_mutex_lock(ui->sensors_mutex);
+		pthread_mutex_lock(&ui->sensors_mutex);
 
 		sensors = ui->sensors;
 		if (!sensors)
@@ -166,12 +164,9 @@ static void update_measures(struct ui_psensor *ui)
 
 		psensor_log_measures(sensors);
 
-		if (cfg->slog_enabled)
-			slog_write_sensors(sensors);
-
 		period = cfg->sensor_update_interval;
 
-		g_mutex_unlock(ui->sensors_mutex);
+		pthread_mutex_unlock(&ui->sensors_mutex);
 
 		sleep(period);
 	}
@@ -211,11 +206,11 @@ gboolean ui_refresh_thread(gpointer data)
 	ret = TRUE;
 	cfg = ui->config;
 
-	g_mutex_lock(ui->sensors_mutex);
+	pthread_mutex_lock(&ui->sensors_mutex);
 
 	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);
@@ -231,7 +226,7 @@ gboolean ui_refresh_thread(gpointer data)
 		ret = FALSE;
 	}
 
-	g_mutex_unlock(ui->sensors_mutex);
+	pthread_mutex_unlock(&ui->sensors_mutex);
 
 	if (ret == FALSE)
 		g_timeout_add(1000 * ui->graph_update_interval,
@@ -410,7 +405,7 @@ static void cb_activate(GApplication *application,
  */
 static void cleanup(struct ui_psensor *ui)
 {
-	g_mutex_lock(ui->sensors_mutex);
+	pthread_mutex_lock(&ui->sensors_mutex);
 
 	log_debug("Cleanup...");
 
@@ -435,7 +430,7 @@ static void cleanup(struct ui_psensor *ui)
 
 	ui_status_cleanup();
 
-	g_mutex_unlock(ui->sensors_mutex);
+	pthread_mutex_unlock(&ui->sensors_mutex);
 
 	config_cleanup();
 
@@ -566,7 +561,7 @@ int main(int argc, char **argv)
 
 	gtk_init(NULL, NULL);
 
-	ui.sensors_mutex = g_mutex_new();
+	pthread_mutex_init(&ui.sensors_mutex, NULL);
 
 	ui.config = config_load();
 
@@ -576,7 +571,10 @@ int main(int argc, char **argv)
 	associate_cb_alarm_raised(ui.sensors, &ui);
 
 	if (ui.config->slog_enabled)
-		slog_init(NULL, ui.sensors);
+		slog_activate(NULL,
+			      ui.sensors,
+			      &ui.sensors_mutex,
+			      config_get_slog_interval());
 
 #if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
 	ui_status_init(&ui);
@@ -585,16 +583,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 +604,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;
 }