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

[Colin Walters]

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

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

	* glib/dbus-gparser.c (struct Parser): Add in_annotation boolean.
	(parse_node, parse_interface, parse_method, parse_signal)
	(parse_property, parse_annotation): Lose if we're currently in an
	annotation.
	(parse_annotation): New function.
	(parser_start_element, parser_end_element): Handle annotation.
	(parse_method, parse_interface): Remove support for c_name attribute,
	switch to annotations.

	* glib/dbus-gidl.h (interface_info_get_binding_names)
	(method_info_get_binding_names)
	(interface_info_get_binding_name, method_info_get_binding_name)
	(interface_info_set_binding_name, method_info_set_binding_name):
	Remove.
	(interface_info_get_annotations, method_info_get_annotations)
	(interface_info_get_annotation, method_info_get_annotation)
	(interface_info_add_annotation, method_info_add_annotation):
	Prototype.

	* glib/dbus-gidl.c (struct InterfaceInfo): Substitute "annotations"
	for "bindings".
	(struct MethodInfo): Ditto.
	Straightfoward conversion of binding methods into annotation methods
	as prototyped.

	* glib/dbus-glib-tool.c (pretty_print): Print annotations.

	* glib/dbus-binding-tool-glib.h (DBUS_GLIB_ANNOTATION_C_SYMBOL): Define.

	* glib/dbus-binding-tool-glib.c (gather_marshallers, generate_glue):
	Use new annotation API.

	* doc/introspect.dtd: Fix a number of DTD syntax errors.  Add
	annotation element.
	
	* doc/dbus-specification.xml: Discuss introspection annotations,
	include list of well-known annotations.

	* test/glib/test-service-glib.xml: Make validate against new DTD.


Index: test-service-glib.xml
===================================================================
RCS file: /cvs/dbus/dbus/test/glib/test-service-glib.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- test-service-glib.xml	17 Feb 2005 17:41:24 -0000	1.1
+++ test-service-glib.xml	17 Feb 2005 21:11:18 -0000	1.2
@@ -2,25 +2,31 @@
 
 <node name="/org/freedesktop/DBus/Tests/MyTestObject">
 
-  <interface name="org.freedesktop.DBus.Tests.MyObject" c_name="my_object">
+  <interface name="org.freedesktop.DBus.Tests.MyObject">
+    <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object"/>
 
-    <method name="DoNothing" c_name="my_object_do_nothing">
+    <method name="DoNothing">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_do_nothing"/>
     </method>
 
-    <method name="Increment" c_name="my_object_increment">
+    <method name="Increment">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_increment"/>
       <arg type="uint32" name="x" />
       <arg type="uint32" direction="out" />
     </method>
 
-    <method name="ThrowError" c_name="my_object_throw_error">
+    <method name="ThrowError">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_throw_error"/>
     </method>
 
-    <method name="Uppercase" c_name="my_object_uppercase">
+    <method name="Uppercase">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_uppercase"/>
       <arg type="string" direction="in" />
       <arg type="string" direction="out" />
     </method>
 
-    <method name="ManyArgs" c_name="my_object_many_args">
+    <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" />