[gobject-introspection/wip/transformer: 16/16] Some regress/testinherit fixes

[Colin Walters <walters src gnome org>]

commit c1a153736571823a5d4343a4f8942d395a490f38
Author: Colin Walters <walters verbum org>
Date:   Thu Aug 12 18:52:15 2010 -0400

    Some regress/testinherit fixes

 gir/cairo-1.0.gir                          |    3 ++-
 giscanner/ast.py                           |    2 ++
 tests/scanner/TestInherit-1.0-expected.gir |    1 +
 tests/scanner/drawable.c                   |   12 ++++++++++++
 4 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/gir/cairo-1.0.gir b/gir/cairo-1.0.gir
index 52e4e76..4ec7241 100644
--- a/gir/cairo-1.0.gir
+++ b/gir/cairo-1.0.gir
@@ -3,7 +3,8 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="cairo" version="1.0">
+  <namespace name="cairo" version="1.0"
+	     c:prefix="cairo">
     <record name="Context" c:type="cairo_t" foreign="1"/>
     <record name="Surface" c:type="cairo_surface_t" foreign="1"/>
     <record name="Matrix" c:type="cairo_matrix_t" foreign="1"/>
diff --git a/giscanner/ast.py b/giscanner/ast.py
index 0006c12..7b1feea 100755
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -317,6 +317,8 @@ identifier string."""
         self._names[node.name] = node
         if hasattr(node, 'ctype'):
             self._ctypes[node.ctype] = node
+        if hasattr(node, 'symbol'):
+            self._ctypes[node.symbol] = node
 
     def remove(self, node):
         from .glibast import GLibBoxed
diff --git a/tests/scanner/TestInherit-1.0-expected.gir b/tests/scanner/TestInherit-1.0-expected.gir
index 1d8a262..2668107 100644
--- a/tests/scanner/TestInherit-1.0-expected.gir
+++ b/tests/scanner/TestInherit-1.0-expected.gir
@@ -15,6 +15,7 @@ and/or use gtk-doc annotations.  -->
              shared-library="libtestinherit.so"
              c:prefix="TestInherit">
     <class name="Drawable"
+           c:symbol-prefix="drawable"
            c:type="TestInheritDrawable"
            parent="GObject.Object"
            abstract="1"
diff --git a/tests/scanner/drawable.c b/tests/scanner/drawable.c
index 0250fc0..0345b03 100644
--- a/tests/scanner/drawable.c
+++ b/tests/scanner/drawable.c
@@ -20,6 +20,12 @@ test_inherit_drawable_do_foo (TestInheritDrawable *drawable, int x)
   
 }
 
+/**
+ * test_inherit_drawable_get_origin:
+ * @drawable:
+ * @x: (out):
+ * @y: (out):
+ */
 void
 test_inherit_drawable_get_origin (TestInheritDrawable *drawable, int *x, int *y)
 {
@@ -27,6 +33,12 @@ test_inherit_drawable_get_origin (TestInheritDrawable *drawable, int *x, int *y)
   *y = 0;
 }
 
+/**
+ * test_inherit_drawable_get_size:
+ * @drawable:
+ * @width: (out):
+ * @height: (out):
+ */
 void
 test_inherit_drawable_get_size (TestInheritDrawable *drawable, guint *width, guint *height)
 {