[gobject-introspection/wip/transformer] [major] Some more annotation fixes

[Colin Walters <walters src gnome org>]

commit 3806d593876d4adebefdb948e76d62b6ebe131d4
Author: Colin Walters <walters verbum org>
Date:   Mon Aug 16 15:06:56 2010 -0400

    [major] Some more annotation fixes

 tests/scanner/Annotation-1.0-expected.gir |    2 +-
 tests/scanner/Foo-1.0-expected.gir        |   28 +++++++++++++++++++---------
 tests/scanner/foo.c                       |    8 +++++++-
 3 files changed, 27 insertions(+), 11 deletions(-)
---
diff --git a/tests/scanner/Annotation-1.0-expected.gir b/tests/scanner/Annotation-1.0-expected.gir
index 23ae78f..3afde08 100644
--- a/tests/scanner/Annotation-1.0-expected.gir
+++ b/tests/scanner/Annotation-1.0-expected.gir
@@ -474,7 +474,7 @@ annotation_object_watch_full().</doc>
       </method>
       <method name="watch_full"
               c:identifier="annotation_object_watch_full"
-              shadowed_by="annotation_object_watch">
+              shadowed-by="annotation_object_watch">
         <doc xml:whitespace="preserve">Test overriding via the "Rename To" annotation.</doc>
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir
index c2dd730..2cee22a 100644
--- a/tests/scanner/Foo-1.0-expected.gir
+++ b/tests/scanner/Foo-1.0-expected.gir
@@ -17,10 +17,10 @@ and/or use gtk-doc annotations.  -->
              shared-library="libfoo.so"
              c:prefix="Foo">
     <alias name="ObjectCookie" c:type="FooObjectCookie">
-      <type name="gpointer"/>
+      <type name="gpointer" c:type="gpointer"/>
     </alias>
     <alias name="XEvent" c:type="FooXEvent">
-      <type name="none"/>
+      <type name="gpointer" c:type="gpointer"/>
     </alias>
     <enumeration name="ASingle" c:type="FooASingle">
       <member name="some_single_enum"
@@ -35,7 +35,8 @@ and/or use gtk-doc annotations.  -->
     <record name="BRect"
             c:type="FooBRect"
             glib:type-name="FooBRect"
-            glib:get-type="foo_brect_get_type">
+            glib:get-type="foo_brect_get_type"
+            c:symbol-prefix="brect">
       <field name="x" writable="1">
         <type name="gdouble" c:type="double"/>
       </field>
@@ -69,7 +70,8 @@ and/or use gtk-doc annotations.  -->
     <union name="BUnion"
            c:type="FooBUnion"
            glib:type-name="FooBUnion"
-           glib:get-type="foo_bunion_get_type">
+           glib:get-type="foo_bunion_get_type"
+           c:symbol-prefix="bunion">
       <field name="type" writable="1">
         <type name="gint" c:type="int"/>
       </field>
@@ -94,7 +96,8 @@ and/or use gtk-doc annotations.  -->
     <record name="Boxed"
             c:type="FooBoxed"
             glib:type-name="FooBoxed"
-            glib:get-type="foo_boxed_get_type">
+            glib:get-type="foo_boxed_get_type"
+            c:symbol-prefix="boxed">
       <constructor name="new" c:identifier="foo_boxed_new">
         <return-value transfer-ownership="full">
           <type name="Boxed" c:type="FooBoxed*"/>
@@ -107,6 +110,7 @@ and/or use gtk-doc annotations.  -->
       </method>
     </record>
     <class name="Buffer"
+           c:symbol-prefix="buffer"
            c:type="FooBuffer"
            parent="Object"
            glib:type-name="FooBuffer"
@@ -121,6 +125,7 @@ and/or use gtk-doc annotations.  -->
     </class>
     <record name="BufferClass"
             c:type="FooBufferClass"
+            disguised="1"
             glib:is-gtype-struct-for="Buffer">
     </record>
     <callback name="Callback" c:type="FooCallback">
@@ -142,7 +147,8 @@ and/or use gtk-doc annotations.  -->
     <record name="DBusData"
             c:type="FooDBusData"
             glib:type-name="FooDBusData"
-            glib:get-type="foo_dbus_data_get_type">
+            glib:get-type="foo_dbus_data_get_type"
+            c:symbol-prefix="dbus_data">
       <method name="method" c:identifier="foo_dbus_data_method">
         <return-value transfer-ownership="none">
           <type name="none" c:type="void"/>
@@ -250,6 +256,7 @@ and/or use gtk-doc annotations.  -->
       </field>
     </record>
     <interface name="Interface"
+               c:symbol-prefix="interface"
                c:type="FooInterface"
                glib:type-name="FooInterface"
                glib:get-type="foo_interface_get_type"
@@ -282,7 +289,7 @@ and/or use gtk-doc annotations.  -->
         <type name="GObject.TypeInterface" c:type="GTypeInterface"/>
       </field>
       <field name="do_foo">
-        <callback name="do_foo" c:type="do_foo">
+        <callback name="do_foo">
           <return-value transfer-ownership="none">
             <type name="none" c:type="void"/>
           </return-value>
@@ -298,6 +305,7 @@ and/or use gtk-doc annotations.  -->
       </field>
     </record>
     <class name="Object"
+           c:symbol-prefix="object"
            c:type="FooObject"
            parent="GObject.Object"
            glib:type-name="FooObject"
@@ -383,8 +391,10 @@ uses a C sugar return type.</doc>
           </parameter>
         </parameters>
       </method>
-      <method name="new_cookie" c:identifier="foo_object_new_cookie">
-        <return-value transfer-ownership="full">
+      <method name="new_cookie"
+              c:identifier="foo_object_new_cookie"
+              introspectable="0">
+        <return-value>
           <type name="ObjectCookie" c:type="FooObjectCookie"/>
         </return-value>
         <parameters>
diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c
index 6239bfa..d664d43 100644
--- a/tests/scanner/foo.c
+++ b/tests/scanner/foo.c
@@ -203,6 +203,12 @@ foo_object_init (FooObject *object)
 
 }
 
+/**
+ * foo_object_external_type:
+ * @object: a #FooObject
+ * 
+ * Returns: (transfer none): %NULL always
+ */
 UtilityObject*
 foo_object_external_type (FooObject *object)
 {
@@ -286,7 +292,7 @@ foo_subobject_init (FooSubobject *object)
  * This function is intended to match clutter_stage_get_default which
  * uses a C sugar return type.
  *
- * Return value: (type FooSubobject): The global #FooSubobject
+ * Return value: (type FooSubobject) (transfer none): The global #FooSubobject
  */
 FooObject *
 foo_object_get_default ()