avoid to use cpp in code

diff --git a/src/Makefile.am b/src/Makefile.am
index 3ddb1e7..7f7749c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,6 +44,7 @@ psensor_SOURCES = \
        ui_appindicator.h \
        ui_color.h ui_color.c \
        ui_graph.h ui_graph.c \
+       ui_notify.h \
        ui_pref.h ui_pref.c \
        ui_sensorlist.h ui_sensorlist.c \
        ui_sensorpref.h ui_sensorpref.c \
@@ -56,7 +57,7 @@ LIBS += $(GTOP_LIBS)
 endif
 
 if LIBNOTIFY
-psensor_SOURCES += ui_notify.h ui_notify.c
+psensor_SOURCES += ui_notify.c
 LIBS += $(LIBNOTIFY_LIBS)
 AM_CPPFLAGS += $(LIBNOTIFY_CFLAGS)
 endif

diff --git a/src/Makefile.in b/src/Makefile.in
index 40b3dcd..d2817fb 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -82,7 +82,7 @@ host_triplet = @host@
 @GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS = psensor$(EXEEXT)
 @GTOP_TRUE@am__append_2 = $(GTOP_CFLAGS)
 @GTOP_TRUE@am__append_3 = $(GTOP_LIBS)
-@LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c
+@LIBNOTIFY_TRUE@am__append_4 = ui_notify.c
 @LIBNOTIFY_TRUE@am__append_5 = $(LIBNOTIFY_LIBS)
 @LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_CFLAGS)
 @APPINDICATOR_TRUE@am__append_7 = ui_appindicator.c 
@@ -120,11 +120,11 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__psensor_SOURCES_DIST = cfg.h cfg.c notify_cmd.c notify_cmd.h \
        graph.h graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
-       ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \
-       ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
+       ui_color.c ui_graph.h ui_graph.c ui_notify.h ui_pref.h \
+       ui_pref.c ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
        ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \
-       ui_notify.h ui_notify.c ui_appindicator.c ui_unity.h \
-       ui_unity.c rsensor.h rsensor.c
+       ui_notify.c ui_appindicator.c ui_unity.h ui_unity.c rsensor.h \
+       rsensor.c
 @LIBNOTIFY_TRUE@am__objects_1 = ui_notify.$(OBJEXT)
 @APPINDICATOR_TRUE@am__objects_2 = ui_appindicator.$(OBJEXT)
 @UNITY_TRUE@am__objects_3 = ui_unity.$(OBJEXT)
@@ -435,8 +435,8 @@ AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
 @GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
 psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \
        graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
-       ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \
-       ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
+       ui_color.c ui_graph.h ui_graph.c ui_notify.h ui_pref.h \
+       ui_pref.c ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
        ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \
        $(am__append_4) $(am__append_7) $(am__append_17) \
        $(am__append_20)

diff --git a/src/main.c b/src/main.c
index 16fd941..175568e 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
@@ -251,10 +248,8 @@ static 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);
 }

diff --git a/src/ui_notify.h b/src/ui_notify.h
index 82b66a1..5b30afe 100644 (file)
--- a/src/ui_notify.h
+++ b/src/ui_notify.h
@@ -19,9 +19,16 @@
 #ifndef _PSENSOR_UI_NOTIFY_H_
 #define _PSENSOR_UI_NOTIFY_H_
 
-#include "psensor.h"
-#include "ui.h"
+#include <ui.h>
 
-void ui_notify(struct psensor *sensor, struct ui_psensor *ui);
+#if defined(HAVE_LIBNOTIFY) && HAVE_LIBNOTIFY
+
+void ui_notify(struct psensor *, struct ui_psensor *);
+
+#else
+
+static inline void ui_notify(struct psensor *s, struct ui_psensor *u) {}
+
+#endif
 
 #endif