dbus/glib dbus-gvalue.c,1.18,1.19

Colin Walters walters at freedesktop.org
Mon Jul 25 04:04:25 EST 2005


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

Modified Files:
	dbus-gvalue.c 
Log Message:
2005-07-24  Colin Walters  <walters at verbum.org>

	* glib/dbus-gvalue.c (signature_iter_to_g_type_array): Don't require
	typedata; recursive arrays won't have it.

	* test/glib/test-dbus-glib.c:
	* test/glib/test-service-glib.c:
	* test/glib/test-service-glib.xml: Add recursive arrays tests.


Index: dbus-gvalue.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gvalue.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- dbus-gvalue.c	11 Jul 2005 16:12:49 -0000	1.18
+++ dbus-gvalue.c	24 Jul 2005 18:04:23 -0000	1.19
@@ -416,16 +416,11 @@
 signature_iter_to_g_type_array (DBusSignatureIter *iter, gboolean is_client)
 {
   GType elt_gtype;
-  DBusGTypeMarshalData *typedata;
 
   elt_gtype = dbus_gtype_from_signature_iter (iter, is_client);
   if (elt_gtype == G_TYPE_INVALID)
     return G_TYPE_INVALID;
 
-  typedata = g_type_get_qdata (elt_gtype, dbus_g_type_metadata_data_quark ());
-  if (typedata == NULL)
-    return G_TYPE_INVALID;
-  
   if (elt_gtype == G_TYPE_OBJECT)
     return DBUS_TYPE_G_OBJECT_ARRAY;
   if (elt_gtype == G_TYPE_STRING)



More information about the dbus-commit mailing list