From: Michal Hruby <michal.mhr@gmail.com>
Date: Tue, 12 Jun 2012 11:57:07 +0000 (+0200)
Subject: girwriter: Use transfer-ownership=none for InitiallyUnowned based constructors
X-Git-Tag: 0.17.2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d44ecb80a702aad220f1091751ca19eadb21bc77;p=thirdparty%2Fvala.git

girwriter: Use transfer-ownership=none for InitiallyUnowned based constructors
---

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index eff974868..7a5cacf61 100644
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -109,6 +109,7 @@ public class Vala.GIRWriter : CodeVisitor {
 	int indent;
 
 	private TypeSymbol gobject_type;
+	private TypeSymbol ginitiallyunowned_type;
 
 	private struct GIRNamespace {
 		public GIRNamespace (string ns, string version) {
@@ -149,6 +150,7 @@ public class Vala.GIRWriter : CodeVisitor {
 		var root_symbol = context.root;
 		var glib_ns = root_symbol.scope.lookup ("GLib");
 		gobject_type = (TypeSymbol) glib_ns.scope.lookup ("Object");
+		ginitiallyunowned_type = (TypeSymbol) glib_ns.scope.lookup ("InitiallyUnowned");
 
 		write_package (package);
 
@@ -1156,7 +1158,7 @@ public class Vala.GIRWriter : CodeVisitor {
 
 		DelegateType delegate_type = type as DelegateType;
 
-		if ((type.value_owned && delegate_type == null) || constructor) {
+		if ((type.value_owned && delegate_type == null) || (constructor && !type.data_type.is_subtype_of (ginitiallyunowned_type))) {
 			buffer.append_printf (" transfer-ownership=\"full\"");
 		} else {
 			buffer.append_printf (" transfer-ownership=\"none\"");