Write property.type as a child node.

2008-04-28  Johan Dahlin  <johan@gnome.org>

        * giscanner/girwriter.py:
        * tests/parser/Foo-expected.gir:
        Write property.type as a child node.

svn path=/trunk/; revision=246

diff --git a/ChangeLog b/ChangeLog
index 057a34d..b178556 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-28  Johan Dahlin  <johan@gnome.org>
+
+       * giscanner/girwriter.py:
+       * tests/parser/Foo-expected.gir:
+       Write property.type as a child node.
+
 2008-04-27  Johan Dahlin  <johan@gnome.org>
 
        * Makefile.am:

diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py
index 4c0df8f..166da8e 100644 (file)
--- a/giscanner/girwriter.py
+++ b/giscanner/girwriter.py
@@ -159,9 +159,9 @@ class GIRWriter(XMLWriter):
                 self._write_method(method)
 
     def _write_property(self, prop):
-        attrs = [('name', prop.name),
-                 ('prop', prop.type.name)]
-        self.write_tag('property', attrs)
+        attrs = [('name', prop.name)]
+        with self.tagcontext('property', attrs):
+            self._write_type(prop.type)
 
     def _write_callback(self, callback):
         attrs = [('name', callback.name)]

diff --git a/tests/parser/Foo-expected.gir b/tests/parser/Foo-expected.gir
index 4996e05..aa6e4d8 100644 (file)
--- a/tests/parser/Foo-expected.gir
+++ b/tests/parser/Foo-expected.gir
@@ -169,7 +169,9 @@
           </parameter>
         </parameters>
       </method>
-      <property name="string" prop="gchararray"/>
+      <property name="string">
+        <type name="gchararray"/>
+      </property>
     </class>
     <class name="Subobject"
            parent="Object"