Author: kelnos
Date: 2008-12-27 04:45:19 +0000 (Sat, 27 Dec 2008)
New Revision: 29055
Modified:
xfconf/trunk/common/xfconf-errors.c
xfconf/trunk/common/xfconf-types.c
xfconf/trunk/xfconf-query/main.c
xfconf/trunk/xfconf/xfconf-binding.c
xfconf/trunk/xfconf/xfconf-channel.c
xfconf/trunk/xfconf/xfconf-private.h
xfconf/trunk/xfconf/xfconf.c
xfconf/trunk/xfconfd/xfconf-backend-factory.c
xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
xfconf/trunk/xfconfd/xfconf-backend.c
xfconf/trunk/xfconfd/xfconf-daemon.c
xfconf/trunk/xfconfd/xfconf-locking-utils.c
Log:
fix a bunch of warnings
Modified: xfconf/trunk/common/xfconf-errors.c
===================================================================
--- xfconf/trunk/common/xfconf-errors.c 2008-12-27 04:06:10 UTC (rev 29054)
+++ xfconf/trunk/common/xfconf-errors.c 2008-12-27 04:45:19 UTC (rev 29055)
@@ -48,7 +48,7 @@
**/
GQuark
-xfconf_get_error_quark()
+xfconf_get_error_quark(void)
{
if(!xfconf_error_quark)
xfconf_error_quark = g_quark_from_static_string("xfconf-error-quark");
@@ -60,7 +60,7 @@
* dbus error names -- the 'nick' value is used, which can have dashes in it,
* which dbus doesn't like. */
GType
-xfconf_error_get_type()
+xfconf_error_get_type(void)
{
static GType type = 0;
Modified: xfconf/trunk/common/xfconf-types.c
===================================================================
--- xfconf/trunk/common/xfconf-types.c 2008-12-27 04:06:10 UTC (rev 29054)
+++ xfconf/trunk/common/xfconf-types.c 2008-12-27 04:45:19 UTC (rev 29055)
@@ -205,7 +205,7 @@
GType
-xfconf_uint16_get_type()
+xfconf_uint16_get_type(void)
{
static GType uint16_type = 0;
GTypeFundamentalInfo finfo = { 0 };
@@ -263,7 +263,7 @@
}
GType
-xfconf_int16_get_type()
+xfconf_int16_get_type(void)
{
static GType int16_type = 0;
GTypeFundamentalInfo finfo = { 0 };
Modified: xfconf/trunk/xfconf/xfconf-binding.c
===================================================================
--- xfconf/trunk/xfconf/xfconf-binding.c 2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconf/xfconf-binding.c 2008-12-27 04:45:19 UTC (rev
29055)
@@ -28,6 +28,7 @@
#define DATA_KEY (I_("--xfconf-g-bindings"))
#include "xfconf.h"
+#include "xfconf-private.h"
#include "xfconf-alias.h"
#include "xfconf-common-private.h"
@@ -359,7 +360,7 @@
void
-_xfconf_g_bindings_init()
+_xfconf_g_bindings_init(void)
{
if(G_UNLIKELY(__bindings))
return;
@@ -369,7 +370,7 @@
}
void
-_xfconf_g_bindings_shutdown()
+_xfconf_g_bindings_shutdown(void)
{
if(G_UNLIKELY(!__bindings))
return;
Modified: xfconf/trunk/xfconf/xfconf-channel.c
===================================================================
--- xfconf/trunk/xfconf/xfconf-channel.c 2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconf/xfconf-channel.c 2008-12-27 04:45:19 UTC (rev
29055)
@@ -98,9 +98,6 @@
PROP_PROPERTY_BASE,
};
-static void xfconf_channel_class_init(XfconfChannelClass *klass);
-
-static void xfconf_channel_init(XfconfChannel *instance);
static void xfconf_channel_set_g_property(GObject *object,
guint property_id,
const GValue *value,
@@ -278,7 +275,7 @@
void
-_xfconf_channel_shutdown()
+_xfconf_channel_shutdown(void)
{
if(G_LIKELY(__channel_singletons)) {
g_hash_table_destroy(__channel_singletons);
@@ -2247,7 +2244,7 @@
/* this really belongs in xfconf.c, but i don't feel like including
* xfconf-dbus-bindings.h twice, or copying the ERROR macros */
gchar **
-xfconf_list_channels()
+xfconf_list_channels(void)
{
DBusGProxy *proxy = _xfconf_get_dbus_g_proxy();
gchar **channels = NULL;
Modified: xfconf/trunk/xfconf/xfconf-private.h
===================================================================
--- xfconf/trunk/xfconf/xfconf-private.h 2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconf/xfconf-private.h 2008-12-27 04:45:19 UTC (rev
29055)
@@ -20,6 +20,8 @@
#ifndef __XFCONF_PRIVATE_H__
#define __XFCONF_PRIVATE_H__
+#include <dbus/dbus-glib.h>
+
typedef struct
{
guint n_members;
Modified: xfconf/trunk/xfconf/xfconf.c
===================================================================
--- xfconf/trunk/xfconf/xfconf.c 2008-12-27 04:06:10 UTC (rev 29054)
+++ xfconf/trunk/xfconf/xfconf.c 2008-12-27 04:45:19 UTC (rev 29055)
@@ -43,7 +43,7 @@
/* private api */
DBusGConnection *
-_xfconf_get_dbus_g_connection()
+_xfconf_get_dbus_g_connection(void)
{
if(!xfconf_refcnt) {
g_critical("xfconf_init() must be called before attempting to use
libxfconf!");
@@ -54,7 +54,7 @@
}
DBusGProxy *
-_xfconf_get_dbus_g_proxy()
+_xfconf_get_dbus_g_proxy(void)
{
if(!xfconf_refcnt) {
g_critical("xfconf_init() must be called before attempting to use
libxfconf!");
@@ -80,7 +80,7 @@
static void
-xfconf_static_dbus_init()
+xfconf_static_dbus_init(void)
{
static gboolean static_dbus_inited = FALSE;
@@ -160,7 +160,7 @@
* called an equal number of times to shut down the library.
**/
void
-xfconf_shutdown()
+xfconf_shutdown(void)
{
if(xfconf_refcnt <= 0) {
return;
Modified: xfconf/trunk/xfconf-query/main.c
===================================================================
--- xfconf/trunk/xfconf-query/main.c 2008-12-27 04:06:10 UTC (rev 29054)
+++ xfconf/trunk/xfconf-query/main.c 2008-12-27 04:45:19 UTC (rev 29055)
@@ -135,19 +135,19 @@
xfconf_query_get_propname_size (gpointer key, gpointer value, gpointer
user_data)
{
gint *size = user_data;
- gchar *property_name = (gchar *)key;
+ gchar *propname = (gchar *)key;
- if ((gint) strlen(property_name) > *size)
- *size = strlen(property_name);
+ if ((gint) strlen(propname) > *size)
+ *size = strlen(propname);
}
static void
xfconf_query_list_sorted (gpointer key, gpointer value, gpointer user_data)
{
- GSList **list = user_data;
+ GSList **listp = user_data;
- *list = g_slist_insert_sorted (*list, key, (GCompareFunc) g_utf8_collate);
+ *listp = g_slist_insert_sorted (*listp, key, (GCompareFunc) g_utf8_collate);
}
static void
@@ -245,6 +245,7 @@
XfconfChannel *channel = NULL;
gboolean prop_exists;
gint fd = -1;
+ GOptionContext *context;
xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
@@ -256,7 +257,7 @@
return 1;
}
- GOptionContext *context = g_option_context_new("- xfconf commandline
utility");
+ context = g_option_context_new("- xfconf commandline utility");
g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
@@ -326,13 +327,15 @@
if (monitor)
{
+ GMainLoop *loop;
+
g_signal_connect (G_OBJECT (channel), "property-changed", G_CALLBACK
(xfconf_query_monitor), NULL);
g_print ("\n");
g_print (_("Start monitoring channel '%s':"), channel_name);
g_print ("\n------------------------------------------------\n\n");
- GMainLoop *loop = g_main_loop_new (NULL, TRUE);
+ loop = g_main_loop_new (NULL, TRUE);
g_main_loop_run (loop);
g_main_loop_unref (loop);
}
@@ -533,10 +536,11 @@
if (channel_contents)
{
gint size = 0;
+ GSList *sorted_contents = NULL;
+
if (verbose)
g_hash_table_foreach (channel_contents,
(GHFunc)xfconf_query_get_propname_size, &size);
- GSList *sorted_contents = NULL;
g_hash_table_foreach (channel_contents,
(GHFunc)xfconf_query_list_sorted, &sorted_contents);
xfconf_query_list_contents (sorted_contents, channel_contents,
size);
Modified: xfconf/trunk/xfconfd/xfconf-backend-factory.c
===================================================================
--- xfconf/trunk/xfconfd/xfconf-backend-factory.c 2008-12-27 04:06:10 UTC
(rev 29054)
+++ xfconf/trunk/xfconfd/xfconf-backend-factory.c 2008-12-27 04:45:19 UTC
(rev 29055)
@@ -40,7 +40,7 @@
static GHashTable *backends = NULL;
static void
-xfconf_backend_factory_ensure_backends()
+xfconf_backend_factory_ensure_backends(void)
{
if(backends)
return;
Modified: xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c
===================================================================
--- xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c 2008-12-27
04:06:10 UTC (rev 29054)
+++ xfconf/trunk/xfconfd/xfconf-backend-perchannel-xml.c 2008-12-27
04:45:19 UTC (rev 29055)
@@ -130,9 +130,6 @@
GValue *list_value;
} XmlParserState;
-static void
xfconf_backend_perchannel_xml_class_init(XfconfBackendPerchannelXmlClass
*klass);
-
-static void xfconf_backend_perchannel_xml_init(XfconfBackendPerchannelXml
*instance);
static void xfconf_backend_perchannel_xml_finalize(GObject *obj);
static void xfconf_backend_perchannel_xml_backend_init(XfconfBackendInterface
*iface);
@@ -1066,7 +1063,7 @@
/* compare versions */
p = strstr(version, ".");
- maj_ver_len = p ? p - version : strlen(version);
+ maj_ver_len = p ? (gsize)(p - version) : strlen(version);
if(maj_ver_len != strlen(FILE_VERSION_MAJOR)
|| strncmp(version, FILE_VERSION_MAJOR, maj_ver_len))
{
Modified: xfconf/trunk/xfconfd/xfconf-backend.c
===================================================================
--- xfconf/trunk/xfconfd/xfconf-backend.c 2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconfd/xfconf-backend.c 2008-12-27 04:45:19 UTC (rev
29055)
@@ -52,7 +52,7 @@
GType
-xfconf_backend_get_type()
+xfconf_backend_get_type(void)
{
static GType backend_type = 0;
Modified: xfconf/trunk/xfconfd/xfconf-daemon.c
===================================================================
--- xfconf/trunk/xfconfd/xfconf-daemon.c 2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconfd/xfconf-daemon.c 2008-12-27 04:45:19 UTC (rev
29055)
@@ -91,9 +91,6 @@
N_SIGS,
};
-static void xfconf_daemon_class_init(XfconfDaemonClass *klass);
-
-static void xfconf_daemon_init(XfconfDaemon *instance);
static void xfconf_daemon_finalize(GObject *obj);
static DBusHandlerResult xfconf_daemon_handle_dbus_disconnect(DBusConnection
*conn,
Modified: xfconf/trunk/xfconfd/xfconf-locking-utils.c
===================================================================
--- xfconf/trunk/xfconfd/xfconf-locking-utils.c 2008-12-27 04:06:10 UTC (rev
29054)
+++ xfconf/trunk/xfconfd/xfconf-locking-utils.c 2008-12-27 04:45:19 UTC (rev
29055)
@@ -45,7 +45,7 @@
static GHashTable *group_cache = NULL;
static void
-xfconf_ensure_group_cache()
+xfconf_ensure_group_cache(void)
{
gboolean needs_rebuild = FALSE;
struct stat st;
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
