Author: kelnos Date: 2009-06-06 09:10:57 +0000 (Sat, 06 Jun 2009) New Revision: 29996
Modified: xfconf/trunk/common/xfconf-types.c xfconf/trunk/xfconf/xfconf-channel.h xfconf/trunk/xfconf/xfconf-errors.h xfconf/trunk/xfconf/xfconf-private.h xfconf/trunk/xfconf/xfconf-types.h xfconf/trunk/xfconf/xfconf.h xfconf/trunk/xfconfd/xfconf-backend-factory.c xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.h xfconf/trunk/xfconfd/xfconf-backend.c xfconf/trunk/xfconfd/xfconf-backend.h xfconf/trunk/xfconfd/xfconf-daemon.h Log: patch from nick to silence warnings (bug 5362) Modified: xfconf/trunk/common/xfconf-types.c =================================================================== --- xfconf/trunk/common/xfconf-types.c 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/common/xfconf-types.c 2009-06-06 09:10:57 UTC (rev 29996) @@ -215,9 +215,9 @@ NULL, ushort_value_copy, NULL, - "i", + (gchar *)"i", ushort_value_collect, - "p", + (gchar *)"p", ushort_value_lcopy }; @@ -273,9 +273,9 @@ NULL, ushort_value_copy, NULL, - "i", + (gchar *)"i", ushort_value_collect, - "p", + (gchar *)"p", ushort_value_lcopy }; Modified: xfconf/trunk/xfconf/xfconf-channel.h =================================================================== --- xfconf/trunk/xfconf/xfconf-channel.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-channel.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -37,7 +37,7 @@ typedef struct _XfconfChannel XfconfChannel; -GType xfconf_channel_get_type() G_GNUC_CONST; +GType xfconf_channel_get_type(void) G_GNUC_CONST; XfconfChannel *xfconf_channel_get(const gchar *channel_name); Modified: xfconf/trunk/xfconf/xfconf-errors.h =================================================================== --- xfconf/trunk/xfconf/xfconf-errors.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-errors.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -45,8 +45,8 @@ XFCONF_ERROR_INVALID_CHANNEL, } XfconfError; -GType xfconf_error_get_type() G_GNUC_CONST; -GQuark xfconf_get_error_quark(); +GType xfconf_error_get_type(void) G_GNUC_CONST; +GQuark xfconf_get_error_quark(void); G_END_DECLS Modified: xfconf/trunk/xfconf/xfconf-private.h =================================================================== --- xfconf/trunk/xfconf/xfconf-private.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-private.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -28,14 +28,16 @@ GType *member_types; } XfconfNamedStruct; -DBusGConnection *_xfconf_get_dbus_g_connection(); -DBusGProxy *_xfconf_get_dbus_g_proxy(); +DBusGConnection *_xfconf_get_dbus_g_connection(void); +DBusGProxy *_xfconf_get_dbus_g_proxy(void); XfconfNamedStruct *_xfconf_named_struct_lookup(const gchar *struct_name); -void _xfconf_channel_shutdown(); +void _xfconf_channel_shutdown(void); +const gchar *_xfconf_channel_get_name(XfconfChannel *channel); +const gchar *_xfconf_channel_get_property_base(XfconfChannel *channel); -void _xfconf_g_bindings_init(); -void _xfconf_g_bindings_shutdown(); +void _xfconf_g_bindings_init(void); +void _xfconf_g_bindings_shutdown(void); #endif /* __XFCONF_PRIVATE_H__ */ Modified: xfconf/trunk/xfconf/xfconf-types.h =================================================================== --- xfconf/trunk/xfconf/xfconf-types.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf-types.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -31,13 +31,13 @@ G_BEGIN_DECLS -GType xfconf_uint16_get_type() G_GNUC_CONST; +GType xfconf_uint16_get_type(void) G_GNUC_CONST; guint16 xfconf_g_value_get_uint16(const GValue *value); void xfconf_g_value_set_uint16(GValue *value, guint16 v_uint16); -GType xfconf_int16_get_type() G_GNUC_CONST; +GType xfconf_int16_get_type(void) G_GNUC_CONST; gint16 xfconf_g_value_get_int16(const GValue *value); void xfconf_g_value_set_int16(GValue *value, Modified: xfconf/trunk/xfconf/xfconf.h =================================================================== --- xfconf/trunk/xfconf/xfconf.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconf/xfconf.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -34,7 +34,7 @@ G_BEGIN_DECLS gboolean xfconf_init(GError **error); -void xfconf_shutdown(); +void xfconf_shutdown(void); void xfconf_named_struct_register(const gchar *struct_name, guint n_members, @@ -42,7 +42,7 @@ void xfconf_array_free(GPtrArray *arr); -gchar **xfconf_list_channels() G_GNUC_WARN_UNUSED_RESULT; +gchar **xfconf_list_channels(void) G_GNUC_WARN_UNUSED_RESULT; G_END_DECLS Modified: xfconf/trunk/xfconfd/xfconf-backend-factory.c =================================================================== --- xfconf/trunk/xfconfd/xfconf-backend-factory.c 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconfd/xfconf-backend-factory.c 2009-06-06 09:10:57 UTC (rev 29996) @@ -52,7 +52,8 @@ { 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 Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.h =================================================================== --- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -35,7 +35,7 @@ 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 Modified: xfconf/trunk/xfconfd/xfconf-backend.c =================================================================== --- xfconf/trunk/xfconfd/xfconf-backend.c 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconfd/xfconf-backend.c 2009-06-06 09:10:57 UTC (rev 29996) @@ -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 @@ -static inline gboolean +static gboolean xfconf_property_is_valid(const gchar *property, GError **error) { @@ -151,7 +151,7 @@ return TRUE; } -static inline gboolean +static gboolean xfconf_channel_is_valid(const gchar *channel, GError **error) { Modified: xfconf/trunk/xfconfd/xfconf-backend.h =================================================================== --- xfconf/trunk/xfconfd/xfconf-backend.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconfd/xfconf-backend.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -118,7 +118,7 @@ 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); Modified: xfconf/trunk/xfconfd/xfconf-daemon.h =================================================================== --- xfconf/trunk/xfconfd/xfconf-daemon.h 2009-06-06 09:05:49 UTC (rev 29995) +++ xfconf/trunk/xfconfd/xfconf-daemon.h 2009-06-06 09:10:57 UTC (rev 29996) @@ -33,7 +33,7 @@ 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); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits