From cf73901c6b7deac8966bbd5832e11d990a65583c Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 22 Aug 2008 20:05:23 +0000
Subject: [PATCH] Pass through recursive types. Avoid overwriting errors.
 Always write the

2008-08-22  Colin Walters  <walters@verbum.org>

	* girepository/girparser.c: Pass through
	recursive types.  Avoid overwriting errors.
	* giscanner/xmlwriter.py: Always write the
	XML header.
	* tests/*.gir: Adjust.
	* tests/scanner/Makefile.am: Build typelibs,
	and generate XML from those.  Once we
	have a good diff mechanism...
	* tests/scanner/*-expected.gir: Add XML
	header.
	* tools/g-ir-scanner: Accept --typelib-xml
	option.
	* tools/generate.c: Better defaults for transfer.

svn path=/trunk/; revision=457
---
 girepository/tools/generate.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/girepository/tools/generate.c b/girepository/tools/generate.c
index b419cf51b..44346ce19 100644
--- a/girepository/tools/generate.c
+++ b/girepository/tools/generate.c
@@ -279,22 +279,19 @@ write_callable_info (const gchar    *namespace,
       g_fprintf (file, "%*s    <parameter name=\"%s\"",
 		 indent, "", g_base_info_get_name ((GIBaseInfo *) arg));
       
-      if (g_type_info_is_pointer (type))
+      switch (g_arg_info_get_ownership_transfer (arg))
 	{
-	  switch (g_arg_info_get_ownership_transfer (arg))
-	    {
-	    case GI_TRANSFER_NOTHING:
-	      break;
-	    case GI_TRANSFER_CONTAINER:
-	      g_fprintf (file, " transfer=\"shallow\"");
-	      break;
-	    case GI_TRANSFER_EVERYTHING:
-	      g_fprintf (file, " transfer=\"full\"");
-	      break;
-	    default:
-	      g_assert_not_reached ();
-	    }
-	}	      
+	case GI_TRANSFER_NOTHING:
+	  break;
+	case GI_TRANSFER_CONTAINER:
+	  g_fprintf (file, " transfer=\"shallow\"");
+	  break;
+	case GI_TRANSFER_EVERYTHING:
+	  g_fprintf (file, " transfer=\"full\"");
+	  break;
+	default:
+	  g_assert_not_reached ();
+	}
       
       g_fprintf (file, " direction=\"");
       switch (g_arg_info_get_direction (arg))