projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
avoid to store configuration in psensor struct
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
16fd941
..
f817c14
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 "slog.h"
#include "ui_pref.h"
#include "ui_graph.h"
+#include <ui_notify.h>
#include "ui_status.h"
#ifdef HAVE_UNITY
#include "ui_status.h"
#ifdef HAVE_UNITY
@@
-64,10
+65,6
@@
#include "ui_appindicator.h"
#include "ui_appindicator.h"
-#ifdef HAVE_LIBNOTIFY
-#include "ui_notify.h"
-#endif
-
#ifdef HAVE_GTOP
#include <pgtop2.h>
#endif
#ifdef HAVE_GTOP
#include <pgtop2.h>
#endif
@@
-251,10
+248,8
@@
static gboolean ui_refresh_thread(gpointer data)
static void cb_alarm_raised(struct psensor *sensor, void *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);
if (sensor->alarm_enabled)
ui_notify(sensor, (struct ui_psensor *)data);
-#endif
notify_cmd(sensor);
}
notify_cmd(sensor);
}
@@
-347,8
+342,6
@@
static void associate_preferences(struct psensor **sensors)
s->name = n;
}
s->name = n;
}
- s->appindicator_enabled = config_is_appindicator_enabled(s->id);
-
sensor_cur++;
}
}
sensor_cur++;
}
}