From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Wed, 24 Sep 2014 19:07:43 +0000 (+0200)
Subject: avoid to use cpp
X-Git-Tag: v1.2.0~129
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=58d4788f69029b757593c67d8fe08eafdcfe224b

avoid to use cpp
---

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 1aaabce..5fbbb8b 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -36,7 +36,7 @@ static const char *ATTENTION_ICON = "psensor_hot";
 
 static struct psensor **sensors;
 static GtkMenuItem **menu_items;
-static int appindicator_supported = 1;
+static bool appindicator_supported = true;
 static AppIndicator *indicator;
 static struct ui_psensor *ui_psensor;
 
@@ -235,7 +235,7 @@ static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
 
 	log_debug("ui_appindicator.unity_fallback()");
 
-	appindicator_supported = 0;
+	appindicator_supported = false;
 
 	ico = ui_status_get_icon(ui_psensor);
 
@@ -251,7 +251,7 @@ unity_unfallback(AppIndicator *indicator, GtkStatusIcon *status_icon)
 
 	ui_status_set_visible(0);
 
-	appindicator_supported = 1;
+	appindicator_supported = true;
 }
 
 void ui_appindicator_update_menu(struct ui_psensor *ui)
@@ -282,7 +282,7 @@ void ui_appindicator_init(struct ui_psensor *ui)
 	ui_appindicator_update_menu(ui);
 }
 
-int is_appindicator_supported(void)
+bool is_appindicator_supported(void)
 {
 	return appindicator_supported;
 }
diff --git a/src/ui_appindicator.h b/src/ui_appindicator.h
index e35d46c..bc625ed 100644
--- a/src/ui_appindicator.h
+++ b/src/ui_appindicator.h
@@ -20,16 +20,22 @@
 #define _PSENSOR_UI_APPINDICATOR_H_
 
 #include <config.h>
+
+#include <bool.h>
 #include <ui.h>
 
-#if defined(HAVE_APPINDICATOR)
+#if defined(HAVE_APPINDICATOR) && HAVE_APPINDICATOR
+
 void ui_appindicator_init(struct ui_psensor *ui);
 void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention);
 void ui_appindicator_update_menu(struct ui_psensor *ui);
-int is_appindicator_supported(void);
+bool is_appindicator_supported(void);
 void ui_appindicator_cleanup(void);
+
 #else
-#define is_appindicator_supported(void) 0
+
+static inline bool is_appindicator_supported(void) { return false; }
+
 #endif
 
 #endif