avoid config in the psensor struct

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a87c643..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,10 +65,6 @@
 
 #include "ui_appindicator.h"
 
-#ifdef HAVE_LIBNOTIFY
-#include "ui_notify.h"
-#endif
-
 #ifdef HAVE_GTOP
 #include <pgtop2.h>
 #endif
@@ -188,18 +185,20 @@ 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)
@@ -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,8 +341,6 @@ static void associate_preferences(struct psensor **sensors)
                        s->name = n;
                }
 
-               s->appindicator_enabled = config_is_appindicator_enabled(s->id);
-
                sensor_cur++;
        }
 }