[Xfce4-commits] [apps/xfce4-volumed-pulse] 52/62: Clean up includes

[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 79545b194b4848e21f1df1e107fc86875c17da32
Author: Lionel Le Folgoc <lionel at lefolgoc.net>
Date:   Fri May 25 20:47:08 2012 +0200

    Clean up includes
---
 configure.ac.in      |  2 +-
 src/main.c           | 11 ++++++++++-
 src/xvd_data_types.h |  9 +--------
 src/xvd_keys.c       |  3 +++
 src/xvd_keys.h       |  8 +-------
 src/xvd_notify.c     |  5 +++++
 src/xvd_notify.h     |  6 ++----
 src/xvd_pulse.c      |  2 +-
 src/xvd_xfconf.h     |  3 +--
 9 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index d56a9af..e3213c9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -48,7 +48,7 @@ AC_PROG_INSTALL()
 dnl **********************************
 dnl *** Check for standard headers ***
 dnl **********************************
-AC_CHECK_HEADERS([errno.h stdio.h stdlib.h string.h unistd.h])
+AC_CHECK_HEADERS([errno.h stdlib.h unistd.h])
 AC_CHECK_FUNCS([daemon setsid])
 
 dnl ***********************************
diff --git a/src/main.c b/src/main.c
index 1f2da5c..3b306c9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -21,22 +21,31 @@
 #include "config.h"
 #endif
 
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
 
 #include <gtk/gtk.h>
 
-#include "xvd_keys.h"
 #include "xvd_data_types.h"
+#include "xvd_keys.h"
 #include "xvd_pulse.h"
 #include "xvd_xfconf.h"
+
 #ifdef HAVE_LIBNOTIFY
 #include "xvd_notify.h"
 #endif
 
+
 XvdInstance     *Inst = NULL;
 
+
 static gint
 xvd_daemonize(void)
 {
diff --git a/src/xvd_data_types.h b/src/xvd_data_types.h
index 9d6f47e..ca9bf68 100644
--- a/src/xvd_data_types.h
+++ b/src/xvd_data_types.h
@@ -24,12 +24,7 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include <glib.h>
 
 #include <xfconf/xfconf.h>
 
@@ -37,8 +32,6 @@
 #include <pulse/context.h>
 #include <pulse/volume.h>
 
-#include <keybinder.h>
-
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notification.h>
 #endif
diff --git a/src/xvd_keys.c b/src/xvd_keys.c
index 7e4aeb8..b487ad8 100644
--- a/src/xvd_keys.c
+++ b/src/xvd_keys.c
@@ -21,9 +21,12 @@
 #include <config.h>
 #endif
 
+#include <keybinder.h>
+
 #include "xvd_keys.h"
 #include "xvd_pulse.h"
 
+
 static
 void xvd_raise_handler (const char *keystring, void *Inst)
 {
diff --git a/src/xvd_keys.h b/src/xvd_keys.h
index 38fafbd..358fd5d 100644
--- a/src/xvd_keys.h
+++ b/src/xvd_keys.h
@@ -20,15 +20,9 @@
 #ifndef _XVD_KEYS_H
 #define _XVD_KEYS_H
 
-#ifdef HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 #include "xvd_data_types.h"
 
+
 void 
 xvd_keys_init(XvdInstance *Inst);
 
diff --git a/src/xvd_notify.c b/src/xvd_notify.c
index 0641804..c340bc2 100644
--- a/src/xvd_notify.c
+++ b/src/xvd_notify.c
@@ -22,8 +22,13 @@
 #endif
 
 #ifdef HAVE_LIBNOTIFY
+#include <libnotify/notify.h>
+
 #include "xvd_notify.h"
 
+#include "xvd_pulse.h"
+
+
 void 
 xvd_notify_notification(XvdInstance *Inst, 
 						gchar* icon, 
diff --git a/src/xvd_notify.h b/src/xvd_notify.h
index 0d325d9..e1ed2f5 100644
--- a/src/xvd_notify.h
+++ b/src/xvd_notify.h
@@ -25,15 +25,13 @@
 #ifndef _XVD_NOTIFY_H
 #define _XVD_NOTIFY_H
 
-#include <libnotify/notify.h>
-#include <libnotify/notification.h>
-#include <libnotify/notify-enum-types.h>
-
 #include "xvd_data_types.h"
 
+
 #define SYNCHRONOUS      "x-canonical-private-synchronous"
 #define LAYOUT_ICON_ONLY "x-canonical-private-icon-only"
 
+
 void 
 xvd_notify_notification(XvdInstance *Inst, 
 						gchar* icon, 
diff --git a/src/xvd_pulse.c b/src/xvd_pulse.c
index 13b396e..dafb48c 100644
--- a/src/xvd_pulse.c
+++ b/src/xvd_pulse.c
@@ -24,9 +24,9 @@
 #include <pulse/error.h>
 #include <pulse/introspect.h>
 #include <pulse/subscribe.h>
-#include <pulse/volume.h>
 
 #include "xvd_pulse.h"
+#include "xvd_notify.h"
 
 
 /**
diff --git a/src/xvd_xfconf.h b/src/xvd_xfconf.h
index 0e5e188..aa60e37 100644
--- a/src/xvd_xfconf.h
+++ b/src/xvd_xfconf.h
@@ -20,10 +20,9 @@
 #ifndef _XVD_XFCONF_H
 #define _XVD_XFCONF_H
 
-#include <xfconf/xfconf.h>
-
 #include "xvd_data_types.h"
 
+
 void 
 xvd_xfconf_init(XvdInstance *Inst);
 

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