dbus/glib dbus-gvalue.c, 1.19, 1.20 dbus-gvalue-utils.c, 1.4, 1.5 dbus-gobject.c, 1.44, 1.45

[Colin Walters]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv22619/glib

Modified Files:
	dbus-gvalue.c dbus-gvalue-utils.c dbus-gobject.c 
Log Message:
2005-08-01  Colin Walters  <walters at 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).


Index: dbus-gvalue.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gvalue.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- dbus-gvalue.c	24 Jul 2005 18:04:23 -0000	1.19
+++ dbus-gvalue.c	1 Aug 2005 16:07:19 -0000	1.20
@@ -189,6 +189,10 @@
 {
   static gboolean types_initialized;
 
+  static const DBusGTypeMarshalVtable basic_vtable = {
+    marshal_basic,
+    demarshal_basic
+  };
 
   if (types_initialized)
     return;
@@ -196,10 +200,6 @@
   dbus_g_type_specialized_init ();
   dbus_g_type_specialized_builtins_init ();
   
-  static const DBusGTypeMarshalVtable basic_vtable = {
-    marshal_basic,
-    demarshal_basic
-  };
 
   /* Register basic types */
   {

Index: dbus-gvalue-utils.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gvalue-utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dbus-gvalue-utils.c	10 Jul 2005 22:54:18 -0000	1.4
+++ dbus-gvalue-utils.c	1 Aug 2005 16:07:19 -0000	1.5
@@ -855,7 +855,6 @@
     NULL
   };
 
-  dbus_g_type_register_collection ("GArray", &array_vtable, 0);
 
   static const DBusGTypeSpecializedCollectionVtable ptrarray_vtable = {
     {
@@ -869,7 +868,6 @@
     NULL,
   };
 
-  dbus_g_type_register_collection ("GPtrArray", &ptrarray_vtable, 0);
 
   static const DBusGTypeSpecializedCollectionVtable slist_vtable = {
     {
@@ -883,8 +881,6 @@
     slist_end_append,
   };
 
-  dbus_g_type_register_collection ("GSList", &slist_vtable, 0);
-
   static const DBusGTypeSpecializedMapVtable hashtable_vtable = {
     {
       hashtable_constructor,
@@ -898,6 +894,9 @@
     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);
 }
 

Index: dbus-gobject.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gobject.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- dbus-gobject.c	31 Jul 2005 02:09:15 -0000	1.44
+++ dbus-gobject.c	1 Aug 2005 16:07:19 -0000	1.45
@@ -373,8 +373,8 @@
   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));