patch from nick to silence warnings (bug 5362)

(Old svn revision: 29996)

5 files changed, 11 insertions, 10 deletions

diff --git a/xfconfd/xfconf-backend-factory.c b/xfconfd/xfconf-backend-factory.c
index 3052cab..c893b3f 100644
--- a/xfconfd/xfconf-backend-factory.c
+++ b/xfconfd/xfconf-backend-factory.c
@@ -52,7 +52,8 @@ xfconf_backend_factory_ensure_backends(void)
     {
         GType *gtype = g_new(GType, 1);
         *gtype = XFCONF_TYPE_BACKEND_PERCHANNEL_XML;
-        g_hash_table_insert(backends, XFCONF_BACKEND_PERCHANNEL_XML_TYPE_ID,
+        g_hash_table_insert(backends,
+                            (gpointer)XFCONF_BACKEND_PERCHANNEL_XML_TYPE_ID,
                             gtype);
     }
 #endif
diff --git a/xfconfd/xfconf-backend-perchannel-xml.h b/xfconfd/xfconf-backend-perchannel-xml.h
index 7117c9a..849663f 100644
--- a/xfconfd/xfconf-backend-perchannel-xml.h
+++ b/xfconfd/xfconf-backend-perchannel-xml.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 
 typedef struct _XfconfBackendPerchannelXml         XfconfBackendPerchannelXml;
 
-GType xfconf_backend_perchannel_xml_get_type() G_GNUC_CONST;
+GType xfconf_backend_perchannel_xml_get_type(void) G_GNUC_CONST;
 
 G_END_DECLS
 
diff --git a/xfconfd/xfconf-backend.c b/xfconfd/xfconf-backend.c
index f8a525c..6cb3adb 100644
--- a/xfconfd/xfconf-backend.c
+++ b/xfconfd/xfconf-backend.c
@@ -28,10 +28,10 @@
 
 static void xfconf_backend_base_init(gpointer g_class);
 
-static inline gboolean xfconf_property_is_valid(const gchar *property,
-                                                GError **error);
-static inline gboolean xfconf_channel_is_valid(const gchar *channel,
-                                               GError **error);
+static gboolean xfconf_property_is_valid(const gchar *property,
+                                         GError **error);
+static gboolean xfconf_channel_is_valid(const gchar *channel,
+                                        GError **error);
 
 /**
  * XfconfBackendInterface:
@@ -91,7 +91,7 @@ xfconf_backend_base_init(gpointer g_class)
 
 
 
-static inline gboolean
+static gboolean
 xfconf_property_is_valid(const gchar *property,
                          GError **error)
 {
@@ -151,7 +151,7 @@ xfconf_property_is_valid(const gchar *property,
     return TRUE;
 }
 
-static inline gboolean
+static gboolean
 xfconf_channel_is_valid(const gchar *channel,
                         GError **error)
 {
diff --git a/xfconfd/xfconf-backend.h b/xfconfd/xfconf-backend.h
index 9c55138..c94bdc5 100644
--- a/xfconfd/xfconf-backend.h
+++ b/xfconfd/xfconf-backend.h
@@ -118,7 +118,7 @@ struct _XfconfBackendInterface
     void (*_xb_reserved3)();
 };
 
-GType xfconf_backend_get_type() G_GNUC_CONST;
+GType xfconf_backend_get_type(void) G_GNUC_CONST;
 
 gboolean xfconf_backend_initialize(XfconfBackend *backend,
                                    GError **error);
diff --git a/xfconfd/xfconf-daemon.h b/xfconfd/xfconf-daemon.h
index 5e3baa9..f034af1 100644
--- a/xfconfd/xfconf-daemon.h
+++ b/xfconfd/xfconf-daemon.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 typedef struct _XfconfDaemon         XfconfDaemon;
 
-GType xfconf_daemon_get_type() G_GNUC_CONST;
+GType xfconf_daemon_get_type(void) G_GNUC_CONST;
 
 XfconfDaemon *xfconf_daemon_new_unique(gchar * const *backend_ids,
                                        GError **error);