Bug 556732 – generate gir files consistently

2008-10-17  Tommi Komulainen  <tommi.komulainen@iki.fi>

	Bug 556732 – generate gir files consistently

	* girepository/girparser.c (start_parameter):
	* tests/boxed.gir:
	* tests/invoke/testfns-1.0.gir:
	* tools/generate.c (write_callable_info): write
	'transfer-ownership' attribute consistently with both
	return-value and parameter elements

svn path=/trunk/; revision=745

diff --git a/ChangeLog b/ChangeLog
index 4198369..0841e4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,17 @@
 
        Bug 556732 – generate gir files consistently
 
+       * girepository/girparser.c (start_parameter):
+       * tests/boxed.gir:
+       * tests/invoke/testfns-1.0.gir:
+       * tools/generate.c (write_callable_info): write
+       'transfer-ownership' attribute consistently with both
+       return-value and parameter elements
+
+2008-10-17  Tommi Komulainen  <tommi.komulainen@iki.fi>
+
+       Bug 556732 – generate gir files consistently
+
        * tools/generate.c (write_callable_info): write 'direction'
        attribute only if other than 'in' to be consistent with
        girwriter.py

diff --git a/girepository/girparser.c b/girepository/girparser.c
index 8dea909..f5bd7cc 100644 (file)
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -706,7 +706,7 @@ start_parameter (GMarkupParseContext *context,
   dipper = find_attribute ("dipper", attribute_names, attribute_values);
   optional = find_attribute ("optional", attribute_names, attribute_values);
   nullok = find_attribute ("null-ok", attribute_names, attribute_values);
-  transfer = find_attribute ("transfer", attribute_names, attribute_values);
+  transfer = find_attribute ("transfer-ownership", attribute_names, attribute_values);
 
   if (name == NULL)
     name = "unknown";

diff --git a/tests/boxed.gir b/tests/boxed.gir
index d30a152..806104c 100644 (file)
--- a/tests/boxed.gir
+++ b/tests/boxed.gir
@@ -27,13 +27,13 @@
               <type name="boxed2"/>
             </type>
           </parameter>
-          <parameter name="t" transfer="full">
+          <parameter name="t" transfer-ownership="full">
             <type name="GLib.HashTable">
               <type name="utf8"/>
               <type name="int64"/>
             </type>
           </parameter>
-          <parameter name="e" transfer="full" direction="out">
+          <parameter name="e" transfer-ownership="full" direction="out">
             <type name="GLib.Error"/>
           </parameter>
         </parameters>
@@ -46,7 +46,7 @@
           <parameter name="box">
             <type name="boxed2"/>
           </parameter>
-          <parameter name="val" transfer="full" direction="inout">
+          <parameter name="val" transfer-ownership="full" direction="inout">
             <type name="uint"/>
           </parameter>
         </parameters>

diff --git a/tests/invoke/testfns-1.0.gir b/tests/invoke/testfns-1.0.gir
index 2afc861..97238b3 100644 (file)
--- a/tests/invoke/testfns-1.0.gir
+++ b/tests/invoke/testfns-1.0.gir
@@ -56,7 +56,7 @@
         <type name="none" c:type="void"/>
       </return-value>
       <parameters>
-        <parameter name="blurb" direction="out" transfer="full">
+        <parameter name="blurb" direction="out" transfer-ownership="full">
           <type name="utf8" c:type="gchar*"/>
         </parameter>
         <parameter name="len" direction="out">
@@ -78,7 +78,7 @@
 
 
     <function name="test7" c:identifier="test7">
-      <return-value transfer="full">
+      <return-value transfer-ownership="full">
          <type name="utf8" c:type="gchar*"/>
       </return-value>
       <parameters>

diff --git a/tools/generate.c b/tools/generate.c
index 52c7064..7294506 100644 (file)
--- a/tools/generate.c
+++ b/tools/generate.c
@@ -423,10 +423,10 @@ write_callable_info (const gchar    *namespace,
        case GI_TRANSFER_NOTHING:
          break;
        case GI_TRANSFER_CONTAINER:
-         xml_printf (file, " transfer=\"container\"");
+         xml_printf (file, " transfer-ownership=\"container\"");
          break;
        case GI_TRANSFER_EVERYTHING:
-         xml_printf (file, " transfer=\"full\"");
+         xml_printf (file, " transfer-ownership=\"full\"");
          break;
        default:
          g_assert_not_reached ();