summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--glib/dbus-gobject.c2
-rw-r--r--glib/dbus-gvalue-utils.c7
-rw-r--r--glib/dbus-gvalue.c8
4 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c434f547..69956bc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-01 Colin Walters <walters@verbum.org>
+
+ Patch from Joe Markus Clarke:
+
+ * glib/dbus-gvalue.c (dbus_g_value_types_init):
+ * glib/dbus-gvalue-utils.c (dbus_g_type_specialized_builtins_init)
+ * glib/dbus-gobject.c (write_interface):
+
+ Don't use C99 style initializers (bug #3933).
+
2005-07-31 Havoc Pennington <hp@redhat.com>
* tools/dbus-viewer.c (load_child_nodes): fix invocation of
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index e6ef38db..9fddf5fe 100644
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -373,8 +373,8 @@ write_interface (gpointer key, gpointer val, gpointer user_data)
for (; methods; methods = methods->next)
{
DBusGMethodInfo *method;
- method = methods->data;
const char *args;
+ method = methods->data;
g_string_append_printf (xml, " <method name=\"%s\">\n",
method_name_from_object_info (object_info, method));
diff --git a/glib/dbus-gvalue-utils.c b/glib/dbus-gvalue-utils.c
index af2fff19..04afaee2 100644
--- a/glib/dbus-gvalue-utils.c
+++ b/glib/dbus-gvalue-utils.c
@@ -855,7 +855,6 @@ dbus_g_type_specialized_builtins_init (void)
NULL
};
- dbus_g_type_register_collection ("GArray", &array_vtable, 0);
static const DBusGTypeSpecializedCollectionVtable ptrarray_vtable = {
{
@@ -869,7 +868,6 @@ dbus_g_type_specialized_builtins_init (void)
NULL,
};
- dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
static const DBusGTypeSpecializedCollectionVtable slist_vtable = {
{
@@ -883,8 +881,6 @@ dbus_g_type_specialized_builtins_init (void)
slist_end_append,
};
- dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
-
static const DBusGTypeSpecializedMapVtable hashtable_vtable = {
{
hashtable_constructor,
@@ -898,6 +894,9 @@ dbus_g_type_specialized_builtins_init (void)
hashtable_append
};
+ dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
+ dbus_g_type_register_collection ("GArray", &array_vtable, 0);
+ dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
dbus_g_type_register_map ("GHashTable", &hashtable_vtable, 0);
}
diff --git a/glib/dbus-gvalue.c b/glib/dbus-gvalue.c
index 2570f2a6..282b3747 100644
--- a/glib/dbus-gvalue.c
+++ b/glib/dbus-gvalue.c
@@ -189,6 +189,10 @@ dbus_g_value_types_init (void)
{
static gboolean types_initialized;
+ static const DBusGTypeMarshalVtable basic_vtable = {
+ marshal_basic,
+ demarshal_basic
+ };
if (types_initialized)
return;
@@ -196,10 +200,6 @@ dbus_g_value_types_init (void)
dbus_g_type_specialized_init ();
dbus_g_type_specialized_builtins_init ();
- static const DBusGTypeMarshalVtable basic_vtable = {
- marshal_basic,
- demarshal_basic
- };
/* Register basic types */
{