[Xfce4-commits] <xfce4-notifyd:master> Fix some comilation warnings.

[Nick Schermer]

Updating branch refs/heads/master
         to 246e4ab250376769632c1da79b9720763829fa94 (commit)
       from fd6cf48061d83b20e93ff9a4399dfd8301fd3f77 (commit)

commit 246e4ab250376769632c1da79b9720763829fa94
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 21:58:01 2010 +0200

    Fix some comilation warnings.

 Makefile.am                        |    8 +++++---
 configure.ac.in                    |    3 +++
 xfce4-notifyd/xfce-notify-daemon.h |    2 +-
 xfce4-notifyd/xfce-notify-window.h |    4 ++--
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d00596f..4323f73 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,8 @@ common_cflags = \
 xfce4_notifyd_xfce4_notifyd_CFLAGS = \
 	-DG_LOG_DOMAIN=\"xfce4-notifyd\" \
 	$(common_cflags) \
-	$(LIBSEXY_CFLAGS)
+	$(LIBSEXY_CFLAGS) \
+	$(LIBX11_CFLAGS)
 
 xfce4_notifyd_config_xfce4_notifyd_config_CFLAGS = \
 	-DG_LOG_DOMAIN=\"xfce4-notifyd-config\" \
@@ -59,7 +60,8 @@ common_ldadd = \
 
 xfce4_notifyd_xfce4_notifyd_LDADD = \
 	$(common_ldadd) \
-	$(LIBSEXY_LIBS)
+	$(LIBSEXY_LIBS) \
+	$(LIBX11_LIBS)
 
 xfce4_notifyd_config_xfce4_notifyd_config_LDADD = \
 	$(common_ldadd) 
@@ -183,7 +185,7 @@ xfce4-notifyd/stamp-xfce-notify-enum-types.h: xfce4-notifyd/xfce-notify-window.h
 	( cd $(srcdir) && glib-mkenums \
 	        --fhead "#ifndef __XFCE_NOTIFY_ENUM_TYPES_H__\n#define __XFCE_NOTIFY_ENUM_TYPES_H__\n#include <glib-object.h>\nG_BEGIN_DECLS\n" \
 	        --fprod "/* enumerations from \"@filename@\" */\n" \
-	        --vhead "GType @enum_name at _get_type() G_GNUC_CONST;\n#define XFCE_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
+	        --vhead "GType @enum_name at _get_type(void) G_GNUC_CONST;\n#define XFCE_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
 	        --ftail "G_END_DECLS\n\n#endif /* __XFCE_NOTIFY_ENUM_TYPES_H__ */" \
 	        xfce4-notifyd/xfce-notify-window.h ) >> xfce4-notifyd/xgen-xneth \
 	&& ( cmp -s xfce4-notifyd/xgen-xneth xfce4-notifyd/xfce-notify-enum-types.h || cp xfce4-notifyd/xgen-xneth xfce4-notifyd/xfce-notify-enum-types.h ) \
diff --git a/configure.ac.in b/configure.ac.in
index 0306eec..6257c03 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -47,6 +47,9 @@ AC_CHECK_HEADERS([errno.h fcntl.h  grp.h signal.h stdlib.h string.h \
 dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
 
+dnl check for x11
+XDT_CHECK_LIBX11_REQUIRE()
+
 dnl required
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
diff --git a/xfce4-notifyd/xfce-notify-daemon.h b/xfce4-notifyd/xfce-notify-daemon.h
index 9b9efe6..888070a 100644
--- a/xfce4-notifyd/xfce-notify-daemon.h
+++ b/xfce4-notifyd/xfce-notify-daemon.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
 
 typedef struct _XfceNotifyDaemon  XfceNotifyDaemon;
 
-GType xfce_notify_daemon_get_type() G_GNUC_CONST;
+GType xfce_notify_daemon_get_type(void) G_GNUC_CONST;
 
 XfceNotifyDaemon *xfce_notify_daemon_new_unique(GError **error);
 
diff --git a/xfce4-notifyd/xfce-notify-window.h b/xfce4-notifyd/xfce-notify-window.h
index d8d9f34..c35ab83 100644
--- a/xfce4-notifyd/xfce-notify-window.h
+++ b/xfce4-notifyd/xfce-notify-window.h
@@ -39,9 +39,9 @@ typedef enum
 
 typedef struct _XfceNotifyWindow  XfceNotifyWindow;
 
-GType xfce_notify_window_get_type() G_GNUC_CONST;
+GType xfce_notify_window_get_type(void) G_GNUC_CONST;
 
-GtkWidget *xfce_notify_window_new();
+GtkWidget *xfce_notify_window_new(void);
 
 GtkWidget *xfce_notify_window_new_full(const gchar *summary,
                                        const gchar *body,