[Xfce4-commits] <xfce4-sensors-plugin:master> fix left-overs with wrong syntax in multiple ifdefs

Fabian noreply at xfce.org
Mon May 9 18:24:01 CEST 2011


Updating branch refs/heads/master
         to df58ddd2f7820b3f39393da643d42e8c8caabcb9 (commit)
       from 198d96225b7bf435793d019128273c7366ebf3d0 (commit)

commit df58ddd2f7820b3f39393da643d42e8c8caabcb9
Author: Fabian <timystery at arcor.de>
Date:   Mon May 9 18:22:30 2011 +0200

    fix left-overs with wrong syntax in multiple ifdefs

 lib/sensors-interface.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/sensors-interface.c b/lib/sensors-interface.c
index f72a608..ba3a662 100644
--- a/lib/sensors-interface.c
+++ b/lib/sensors-interface.c
@@ -24,7 +24,7 @@
 #endif
 
 /* Global includes */
-#ifdef HAVE_LIBNOTIFY4 || HAVE_LIBNOTIFY7
+#if defined(HAVE_LIBNOTIFY4) || defined(HAVE_LIBNOTIFY7)
 #include <libnotify/notify.h>
 #endif
 /* #include <stdlib.h> */
@@ -71,10 +71,10 @@ fill_gtkTreeStore (GtkTreeStore *model, t_chip *chip, t_tempscale scale, t_senso
     t_chipfeature *chipfeature;
     gboolean *suppress;
     GtkTreeIter *iter;
-    #ifdef HAVE_LIBNOTIFY4 || HAVE_LIBNOTIFY7
+#if defined(HAVE_LIBNOTIFY4) || defined(HAVE_LIBNOTIFY7)
     NotifyNotification *nn;
     GError *error = NULL;
-    #endif
+#endif
     gchar *summary, *body, *icon;
     float minval, maxval;
 
@@ -101,7 +101,7 @@ fill_gtkTreeStore (GtkTreeStore *model, t_chip *chip, t_tempscale scale, t_senso
                     (chip, chipfeature->address, &sensorFeature, suppress);
             if ( res!=0 && !suppress) {
 
-                #ifdef HAVE_LIBNOTIFY4 || HAVE_LIBNOTIFY7
+#if defined(HAVE_LIBNOTIFY4) || defined(HAVE_LIBNOTIFY7)
                 if (!notify_is_initted())
                     notify_init(PACKAGE); /* NOTIFY_APPNAME */
                     
@@ -112,9 +112,9 @@ fill_gtkTreeStore (GtkTreeStore *model, t_chip *chip, t_tempscale scale, t_senso
                 nn = notify_notification_new (summary, body, icon);
 #endif
                 notify_notification_show(nn, &error);
-                #else
+#else
                 DBG("%s\n%s", summary, body);
-                #endif
+#endif
 
                 /* FIXME: Better popup a window or DBG message or quit plugin. */
                 break;



More information about the Xfce4-commits mailing list