From 08f8ffe30eede149c1b3b2b4ab638506060ea4a1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 25 Sep 2014 08:19:45 +0200
Subject: [PATCH] avoid to use cpp in code

---
 src/lib/pudisks2.h | 20 ++++++++++++++++++--
 src/ui_pref.c      | 15 +++++++++------
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/lib/pudisks2.h b/src/lib/pudisks2.h
index 1a844bc..3a76789 100644
--- a/src/lib/pudisks2.h
+++ b/src/lib/pudisks2.h
@@ -21,7 +21,23 @@
 
 #include <psensor.h>
 
-void udisks2_psensor_list_append(struct psensor ***sensors, int values_length);
-void udisks2_psensor_list_update(struct psensor **sensors);
+#if defined(HAVE_LIBUDISKS2) && HAVE_LIBUDISKS2
+
+static inline bool udisks2_is_supported(void) { return true; }
+
+void udisks2_psensor_list_append(struct psensor ***, int);
+void udisks2_psensor_list_update(struct psensor **);
+
+#else
+
+static inline bool udisks2_is_supported(void) { return false; }
+
+static inline void
+udisks2_psensor_list_append(struct psensor ***s, int n) {}
+
+static inline void
+udisks2_psensor_list_update(struct psensor **s) {}
+
+#endif
 
 #endif
diff --git a/src/ui_pref.c b/src/ui_pref.c
index 6f7f3b6..81dfe11 100644
--- a/src/ui_pref.c
+++ b/src/ui_pref.c
@@ -25,6 +25,7 @@
 #include <graph.h>
 #include <nvidia.h>
 #include <pgtop2.h>
+#include <pudisks2.h>
 #include <pxdg.h>
 #include <ui_pref.h>
 #include <ui_color.h>
@@ -251,12 +252,14 @@ void ui_pref_dialog_run(struct ui_psensor *ui)
 	w_udisks2
 		= GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							   "udisks2"));
-#if !HAVE_LIBUDISKS2
-	gtk_widget_set_sensitive(GTK_WIDGET(w_udisks2), 0);
-	gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), TRUE);
-#else
-	gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), FALSE);
-#endif
+
+	if (udisks2_is_supported()) {
+		gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), FALSE);
+	} else {
+		gtk_widget_set_sensitive(GTK_WIDGET(w_udisks2), 0);
+		gtk_widget_set_has_tooltip(GTK_WIDGET(w_udisks2), TRUE);
+	}
+
 	gtk_toggle_button_set_active(w_udisks2, config_is_udisks2_enabled());
 
 	result = gtk_dialog_run(diag);
-- 
2.7.4