gobject-introspection r745 - in trunk: . girepository tests tests/invoke tools

[tko svn gnome org]

Author: tko
Date: Fri Oct 17 14:59:23 2008
New Revision: 745
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=745&view=rev

Log:
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

Modified:
   trunk/ChangeLog
   trunk/girepository/girparser.c
   trunk/tests/boxed.gir
   trunk/tests/invoke/testfns-1.0.gir
   trunk/tools/generate.c

Modified: trunk/girepository/girparser.c
==============================================================================
--- trunk/girepository/girparser.c	(original)
+++ trunk/girepository/girparser.c	Fri Oct 17 14:59:23 2008
@@ -706,7 +706,7 @@
   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";

Modified: trunk/tests/boxed.gir
==============================================================================
--- trunk/tests/boxed.gir	(original)
+++ trunk/tests/boxed.gir	Fri Oct 17 14:59:23 2008
@@ -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>

Modified: trunk/tests/invoke/testfns-1.0.gir
==============================================================================
--- trunk/tests/invoke/testfns-1.0.gir	(original)
+++ trunk/tests/invoke/testfns-1.0.gir	Fri Oct 17 14:59:23 2008
@@ -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>

Modified: trunk/tools/generate.c
==============================================================================
--- trunk/tools/generate.c	(original)
+++ trunk/tools/generate.c	Fri Oct 17 14:59:23 2008
@@ -423,10 +423,10 @@
 	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 ();