From cef390f65ffe9e51b103fcb29ee177882f762a0e Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 29 Aug 2011 22:17:02 -0400
Subject: scanner: Don't try to copy c:type if we're parsing (element-type)

Commit 81abc2eb63317003a11d1484e84698a37e8ec035 tries harder to keep
the c:type if it was overriden by a (type) annotation.  However, the
_resolve() function was also called for (element-type), which had
undesirable effects - we'd copy the container c:type to the element
type.

Fix this by splitting out the c:type preservation to only happen when
processing toplevel types.

https://bugzilla.gnome.org/show_bug.cgi?id=656931
---
 tests/scanner/Foo-1.0-expected.gir | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/scanner/Foo-1.0-expected.gir')

diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir
index ffcf2167..371250f5 100644
--- a/tests/scanner/Foo-1.0-expected.gir
+++ b/tests/scanner/Foo-1.0-expected.gir
@@ -1117,7 +1117,7 @@ exposed to language bindings.</doc>
     <function name="test_array" c:identifier="foo_test_array">
       <return-value transfer-ownership="container">
         <array name="GLib.Array" c:type="GArray*">
-          <type name="utf8" c:type="GArray*"/>
+          <type name="utf8"/>
         </array>
       </return-value>
     </function>
-- 
cgit v1.2.1