dbus/test/glib test-service-glib.xml,1.2,1.3

[Colin Walters]

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

Modified Files:
	test-service-glib.xml 
Log Message:
2005-02-27  Colin Walters  <walters at verbum.org>

	* glib/dbus-gidl.c (property_info_get_type, arg_info_get_type):
	Change return value to const char * instead of int so we can do
	full signatures.
	(struct PropertyInfo, struct ArgInfo): Store char *.
	(property_info_new, arg_info_new): Update parameters, strdup.
	(property_info_unref, arg_info_unref): Free.

	* glib/dbus-gidl.h: Update prototypes.

	* glib/dbus-gparser.c (basic_type_from_string): Delete.
	(validate_signature): New function, just validates signature and
	sets GError.
	(parse_property, parse_arg): Invoke validate_signature.  Store
	signature instead of just type code.

	* glib/dbus-gvalue.c (base_type_from_signature): New utility
	function to return a primary type for a signature, dropping
	information about types in container types.
	(dbus_gvalue_genmarshal_name_from_type)
	(dbus_gvalue_binding_type_from_type)
	(dbus_gvalue_ctype_from_type): Update to take full signature
	 instead of type code.
	(dbus_gtype_to_dbus_type): Moved here from glib/dbus-gobject.c.

	* glib/dbus-gvalue.h: Update prototypes for above.

	* glib/dbus-gobject.c (gtype_to_dbus_type): Moved to
	glib/dbus-gvalue.c as dbus_gtype_to_dbus_type.
	(introspect_properties, introspect_signals, write_interface):
	Update to handle signatures, and remove usage of
	_dbus_gutils_type_to_string.
	(handle_introspect): Print out type codes instead of e.g. "string"
	in hardcoded introspection XML; also use x_AS_STRING constants
	instead of hardcoding in string.

	* glib/dbus-glib-tool.c (pretty_print): Handle signature change
	to string.  Remove usage of _dbus_gutils_type_to_string.

	* glib/dbus-gutils.c (_dbus_gutils_type_to_string): Delete.

	* glib/dbus-gutils.h (_dbus_gutils_type_to_string): Update for
	deletion.
	
	* glib/dbus-binding-tool-glib.c (compute_marshaller)
	(compute_marshaller_name, generate_glue): Handle signature change
	to string.
	(write_formal_parameters, write_args_for_direction): Ditto, and
	remove FIXME.

	* tools/dbus-tree-view.c (type_to_string): Delete.
	(info_set_func_text): Update to print full signatures.

	* test/glib/test-service-glib.xml: Change types to new
	introspection format.


Index: test-service-glib.xml
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-service-glib.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test-service-glib.xml	17 Feb 2005 21:11:18 -0000	1.2
+++ test-service-glib.xml	27 Feb 2005 17:38:12 -0000	1.3
@@ -11,8 +11,8 @@
 
     <method name="Increment">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_increment"/>
-      <arg type="uint32" name="x" />
-      <arg type="uint32" direction="out" />
+      <arg type="u" name="x" />
+      <arg type="u" direction="out" />
     </method>
 
     <method name="ThrowError">
@@ -21,17 +21,17 @@
 
     <method name="Uppercase">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_uppercase"/>
-      <arg type="string" direction="in" />
-      <arg type="string" direction="out" />
+      <arg type="s" direction="in" />
+      <arg type="s" direction="out" />
     </method>
 
     <method name="ManyArgs">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_many_args"/>
-      <arg type="uint32" name="x" direction="in" />
-      <arg type="string" name="str" direction="in" />
-      <arg type="double" name="trouble" direction="in" />
-      <arg type="double" name="d_ret" direction="out" />
-      <arg type="string" name="str_ret" direction="out" />
+      <arg type="u" name="x" direction="in" />
+      <arg type="s" name="str" direction="in" />
+      <arg type="d" name="trouble" direction="in" />
+      <arg type="d" name="d_ret" direction="out" />
+      <arg type="s" name="str_ret" direction="out" />
     </method>
 
   </interface>