dbus/dbus dbus-glib.h,1.15,1.16

[Colin Walters]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv27531/dbus

Modified Files:
	dbus-glib.h 
Log Message:
2005-06-29  Colin Walters  <walters at verbum.org>

	* dbus/dbus-glib.h: Delete DBUS_TYPE_G_PROXY_ARRAY.  Add
	DBUS_TYPE_G_OBJECT_PATH.

	* glib/dbus-gvalue.c (dbus_g_value_types_init): Remove marshallers
	for G_TYPE_OBJECT and DBUS_TYPE_G_PROXY_ARRAY (the latter should
	be handled more generically).  Add DBUS_TYPE_G_OBJECT_PATH.
	(dbus_g_object_path_get_g_type): New function.
	(dbus_gtype_from_signature_iter): Map DBUS_TYPE_OBJECT_PATH
	to DBUS_TYPE_G_OBJECT_PATH by default.
	(demarshal_proxy): Remove unused name variable.
	(demarshal_object_path, marshal_object_path): New functions.
	(demarshal_proxy_array, marshal_proxy_array): Delete.
	
	* glib/dbus-binding-tool-glib.c (dbus_g_type_get_c_name): Map
	DBUS_TYPE_G_OBJECT_PATH to char *.
	(dbus_g_type_get_lookup_function): Map builtin
	DBUS_TYPE_G_OBJECT_PATH.

	* test/glib/test-dbus-glib.c
	* test/glib/test-service-glib.c (my_object_objpath): 
	Adapt tests to new object path marshalling.


Index: dbus-glib.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-glib.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dbus-glib.h	26 Jun 2005 17:02:09 -0000	1.15
+++ dbus-glib.h	29 Jun 2005 23:52:35 -0000	1.16
@@ -177,13 +177,13 @@
 
 #define DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
 
-/* D-BUS-specific types */
-#define DBUS_TYPE_G_PROXY_ARRAY          (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_PROXY))
-
 /* Generic recursive value */
 GType        dbus_g_value_get_g_type               (void) G_GNUC_CONST;
 #define DBUS_TYPE_G_VALUE                (dbus_g_value_get_g_type ())
 
+GType        dbus_g_object_path_get_g_type         (void) G_GNUC_CONST;
+#define DBUS_TYPE_G_OBJECT_PATH (dbus_g_object_path_get_g_type ())
+
 void         dbus_g_value_open              (DBusGValue          *value,
 					     DBusGValueIterator  *iter);