avoid config in the psensor struct

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 461949f..3a126c5 100644 (file)
--- 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);
 
@@ -188,21 +185,23 @@ static void *update_measures(void *data)
 
 static void indicators_update(struct ui_psensor *ui)
 {
-       struct psensor **sensor_cur = ui->sensors;
-       unsigned int attention = 0;
+       struct psensor **ss, *s;
+       bool attention;
 
-       while (*sensor_cur) {
-               struct psensor *s = *sensor_cur;
+       attention = false;
+       ss = ui->sensors;
+       while (*ss) {
+               s = *ss;
 
-               if (s->alarm_enabled && s->alarm_raised) {
-                       attention = 1;
+               if (s->alarm_raised && config_get_sensor_alarm_enabled(s->id)) {
+                       attention = true;
                        break;
                }
 
-               sensor_cur++;
+               ss++;
        }
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
        if (is_appindicator_supported())
                ui_appindicator_update(ui, attention);
 #endif
@@ -211,7 +210,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,12 +250,10 @@ gboolean ui_refresh_thread(gpointer data)
 
 static void cb_alarm_raised(struct psensor *sensor, void *data)
 {
-#ifdef HAVE_LIBNOTIFY
-       if (sensor->alarm_enabled)
+       if (config_get_sensor_alarm_enabled(sensor->id)) {
                ui_notify(sensor, (struct ui_psensor *)data);
-#endif
-
-       notify_cmd(sensor);
+               notify_cmd(sensor);
+       }
 }
 
 static void associate_colors(struct psensor **sensors)
@@ -323,9 +320,6 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
                s->alarm_low_threshold
                        = config_get_sensor_alarm_low_threshold(s->id);
 
-               s->alarm_enabled
-                           = config_get_sensor_alarm_enabled(s->id);
-
                sensor_cur++;
        }
 }
@@ -347,13 +341,11 @@ static void associate_preferences(struct psensor **sensors)
                        s->name = n;
                }
 
-               s->appindicator_enabled = config_is_appindicator_enabled(s->id);
-
                sensor_cur++;
        }
 }
 
-static void log_init()
+static void log_init(void)
 {
        const char *dir;
        char *path;
@@ -372,12 +364,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 +394,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,
@@ -443,7 +435,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
 
@@ -519,7 +511,7 @@ int main(int argc, char **argv)
        pthread_t thread;
        int optc, cmdok, opti, new_instance, ret;
        char *url = NULL;
-       GtkApplication *app;
+       GApplication *app;
 
        program_name = argv[0];
 
@@ -567,12 +559,12 @@ int main(int argc, char **argv)
 
        log_init();
 
-       app = gtk_application_new("wpitchoune.psensor", G_APPLICATION_IS_SERVICE);
+       app = g_application_new("wpitchoune.psensor", 0);
 
-       printf("%d\n",g_application_register(G_APPLICATION(app), NULL, NULL));
+       g_application_register(app, NULL, NULL);
 
-       if (!new_instance && g_application_get_is_remote(G_APPLICATION(app))) {
-               g_application_activate(G_APPLICATION(app));
+       if (!new_instance && g_application_get_is_remote(app)) {
+               g_application_activate(app);
                log_warn(_("A Psensor instance already exists."));
                exit(EXIT_SUCCESS);
        }
@@ -589,17 +581,6 @@ 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);
@@ -615,7 +596,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
@@ -634,7 +615,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