X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=175568ea052ed7a463061e84d5374352cdaf0511;hb=b2706f38717e778f37beac8d7063d7e48d2a8f33;hp=262ffbf3049d398cb5665f8766d4ba8a7fd6663f;hpb=fa1395301c20b43c9b044fa08af3ceb17882fa6a;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 262ffbf..175568e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,6 +44,7 @@
 #include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
+#include <ui_notify.h>
 #include "ui_status.h"
 
 #ifdef HAVE_UNITY
@@ -64,17 +65,13 @@
 
 #include "ui_appindicator.h"
 
-#ifdef HAVE_LIBNOTIFY
-#include "ui_notify.h"
-#endif
-
 #ifdef HAVE_GTOP
 #include <pgtop2.h>
 #endif
 
 static const char *program_name;
 
-static void print_version()
+static void print_version(void)
 {
 	printf("psensor %s\n", VERSION);
 	printf(_("Copyright (C) %s jeanfi@gmail.com\n"
@@ -86,7 +83,7 @@ static void print_version()
 	       "2010-2014");
 }
 
-static void print_help()
+static void print_help(void)
 {
 	printf(_("Usage: %s [OPTION]...\n"), program_name);
 
@@ -202,7 +199,7 @@ static void indicators_update(struct ui_psensor *ui)
 		sensor_cur++;
 	}
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
 	if (is_appindicator_supported())
 		ui_appindicator_update(ui, attention);
 #endif
@@ -211,7 +208,7 @@ static void indicators_update(struct ui_psensor *ui)
 		ui_status_update(ui, attention);
 }
 
-gboolean ui_refresh_thread(gpointer data)
+static gboolean ui_refresh_thread(gpointer data)
 {
 	struct config *cfg;
 	gboolean ret;
@@ -251,10 +248,8 @@ gboolean ui_refresh_thread(gpointer data)
 
 static void cb_alarm_raised(struct psensor *sensor, void *data)
 {
-#ifdef HAVE_LIBNOTIFY
 	if (sensor->alarm_enabled)
 		ui_notify(sensor, (struct ui_psensor *)data);
-#endif
 
 	notify_cmd(sensor);
 }
@@ -353,7 +348,7 @@ static void associate_preferences(struct psensor **sensors)
 	}
 }
 
-static void log_init()
+static void log_init(void)
 {
 	const char *dir;
 	char *path;
@@ -372,12 +367,12 @@ static void log_init()
 }
 
 static struct option long_options[] = {
-	{"version", no_argument, 0, 'v'},
-	{"help", no_argument, 0, 'h'},
-	{"url", required_argument, 0, 'u'},
-	{"debug", required_argument, 0, 'd'},
-	{"new-instance", no_argument, 0, 'n'},
-	{0, 0, 0, 0}
+	{"version", no_argument, NULL, 'v'},
+	{"help", no_argument, NULL, 'h'},
+	{"url", required_argument, NULL, 'u'},
+	{"debug", required_argument, NULL, 'd'},
+	{"new-instance", no_argument, NULL, 'n'},
+	{NULL, 0, NULL, 0}
 };
 
 static gboolean initial_window_show(gpointer data)
@@ -402,7 +397,7 @@ static gboolean initial_window_show(gpointer data)
 	return FALSE;
 }
 
-static void log_glib_info()
+static void log_glib_info(void)
 {
 	log_debug("Compiled with GLib %d.%d.%d",
 		  GLIB_MAJOR_VERSION,
@@ -430,8 +425,6 @@ static void cleanup(struct ui_psensor *ui)
 
 	log_debug("Cleanup...");
 
-	psensor_cleanup();
-
 #ifdef HAVE_NVIDIA
 	nvidia_cleanup();
 #endif
@@ -445,7 +438,7 @@ static void cleanup(struct ui_psensor *ui)
 	psensor_list_free(ui->sensors);
 	ui->sensors = NULL;
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
 	ui_appindicator_cleanup();
 #endif
 
@@ -591,25 +584,12 @@ int main(int argc, char **argv)
 	g_thread_init(NULL);
 #endif
 
-#ifdef HAVE_APPINDICATOR_029
-	/* gdk_thread_enter/leave only used to workaround mutex bug
-	 * of appindicator < 0.2.9, so do not call gdk_threads_init
-	 * if useless. Calling this function leads to
-	 * crash "Attempt to unlock mutex that was not locked" with
-	 * GLib 2.41.2 (new checking) probably due to bugs in GTK
-	 * itself.
-	 */
-	gdk_threads_init();
-#endif
-
 	gtk_init(NULL, NULL);
 
 	pmutex_init(&ui.sensors_mutex);
 
 	ui.config = config_load();
 
-	psensor_init();
-
 	ui.sensors = create_sensors_list(url);
 	associate_cb_alarm_raised(ui.sensors, &ui);
 
@@ -619,7 +599,7 @@ int main(int argc, char **argv)
 			      &ui.sensors_mutex,
 			      config_get_slog_interval());
 
-#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
+#if !defined(HAVE_APPINDICATOR)
 	ui_status_init(&ui);
 	ui_status_set_visible(1);
 #endif
@@ -638,7 +618,7 @@ int main(int argc, char **argv)
 
 	g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
 	ui_appindicator_init(&ui);
 #endif