gobject-introspection r691 - in trunk: . tools

[tko svn gnome org]

Author: tko
Date: Sun Oct 12 21:07:39 2008
New Revision: 691
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=691&view=rev

Log:
2008-10-12  Tommi Komulainen  <tommi komulainen iki fi>

	* tools/generate.c (write_callable_info): move "transfer" and
	"null-ok" attributes from <function> to <return-value> element

Modified:
   trunk/ChangeLog
   trunk/tools/generate.c

Modified: trunk/tools/generate.c
==============================================================================
--- trunk/tools/generate.c	(original)
+++ trunk/tools/generate.c	Sun Oct 12 21:07:39 2008
@@ -239,6 +239,10 @@
 
   type = g_callable_info_get_return_type (info);
 
+  g_fprintf (file, ">\n");
+
+  g_fprintf (file, "%*s  <return-value", indent, "");
+
   if (g_type_info_is_pointer (type))
     {
       switch (g_callable_info_get_caller_owns (info))
@@ -255,14 +259,12 @@
 	  g_assert_not_reached ();
 	}
     }
-
-  g_fprintf (file, ">\n");
-
-  g_fprintf (file, "%*s  <return-value>\n", indent, "");
   
   if (g_callable_info_may_return_null (info))
     g_fprintf (file, " null-ok=\"1\"");
 
+  g_fprintf (file, ">\n");
+
   g_fprintf (file, "%*s  <type name=\"", indent + 2, "");
 
   write_type_info (namespace, type, file);