[Xfce4-commits] [apps/xfce4-volumed-pulse] 56/62: Improve libnotify include guards

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/xfce4-volumed-pulse.

commit f86468296f1f081d6aed217802c1e58f1210e772
Author: Lionel Le Folgoc <lionel at lefolgoc.net>
Date:   Fri May 25 21:45:57 2012 +0200

    Improve libnotify include guards
---
 src/xvd_notify.c | 6 ++----
 src/xvd_notify.h | 9 ++++-----
 src/xvd_pulse.c  | 4 +++-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/xvd_notify.c b/src/xvd_notify.c
index 4a3e0f3..a5be87a 100644
--- a/src/xvd_notify.c
+++ b/src/xvd_notify.c
@@ -21,13 +21,12 @@
 #include <config.h>
 #endif
 
-#ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 
-#include "xvd_notify.h"
-
 #include "xvd_pulse.h"
 
+#include "xvd_notify.h"
+
 
 void 
 xvd_notify_notification(XvdInstance *Inst, 
@@ -143,4 +142,3 @@ xvd_notify_uninit (XvdInstance *Inst)
 	Inst->notification = NULL;
 	notify_uninit ();
 }
-#endif
diff --git a/src/xvd_notify.h b/src/xvd_notify.h
index e1ed2f5..d5d7926 100644
--- a/src/xvd_notify.h
+++ b/src/xvd_notify.h
@@ -17,14 +17,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _XVD_NOTIFY_H
+#define _XVD_NOTIFY_H
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
-#ifdef HAVE_LIBNOTIFY
-#ifndef _XVD_NOTIFY_H
-#define _XVD_NOTIFY_H
-
 #include "xvd_data_types.h"
 
 
@@ -52,5 +51,5 @@ xvd_notify_init(XvdInstance *Inst,
 
 void 
 xvd_notify_uninit(XvdInstance *Inst);
-#endif
+
 #endif
diff --git a/src/xvd_pulse.c b/src/xvd_pulse.c
index f04804e..fb2234e 100644
--- a/src/xvd_pulse.c
+++ b/src/xvd_pulse.c
@@ -26,8 +26,10 @@
 #include <pulse/subscribe.h>
 
 #include "xvd_pulse.h"
-#include "xvd_notify.h"
 
+#ifdef HAVE_LIBNOTIFY
+#include "xvd_notify.h"
+#endif
 
 /**
  * Translates a "human" volume step (0-100) for PulseAudio.

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.