From 932272884c8fbdbed70c5a69dc408ece5044a527 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 1 Aug 2005 16:07:19 +0000 Subject: 2005-08-01 Colin Walters 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). --- glib/dbus-gvalue-utils.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'glib/dbus-gvalue-utils.c') 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); } -- cgit