From: Luca Bruno <lucabru@src.gnome.org>
Date: Sat, 18 Dec 2010 10:54:43 +0000 (+0100)
Subject: Support delegates with owned delegate return types
X-Git-Tag: 0.11.3~53
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2b4fe06ebfc51bd561e2efcccfb85f2dac14a19;p=thirdparty%2Fvala.git

Support delegates with owned delegate return types

Fixes bug 633839.
---

diff --git a/codegen/valaccodedelegatemodule.vala b/codegen/valaccodedelegatemodule.vala
index 12ecb6335..5e978f083 100644
--- a/codegen/valaccodedelegatemodule.vala
+++ b/codegen/valaccodedelegatemodule.vala
@@ -91,6 +91,10 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
 			if (result_d.has_target) {
 				var cparam = new CCodeParameter (get_delegate_target_cname ("result"), "void**");
 				cfundecl.add_parameter (cparam);
+				if (deleg_type.value_owned) {
+					cparam = new CCodeParameter (get_delegate_target_destroy_notify_cname ("result"), "GDestroyNotify*");
+					cfundecl.add_parameter (cparam);
+				}
 			}
 		} else if (d.return_type.is_real_non_null_struct_type ()) {
 			var cparam = new CCodeParameter ("result", "%s*".printf (d.return_type.get_cname ()));
@@ -234,6 +238,10 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
 			if (deleg_type.delegate_symbol.has_target) {
 				var cparam = new CCodeParameter (get_delegate_target_cname ("result"), "void**");
 				cparam_map.set (get_param_pos (d.cdelegate_target_parameter_position), cparam);
+				if (deleg_type.value_owned) {
+					cparam = new CCodeParameter (get_delegate_target_destroy_notify_cname ("result"), "GDestroyNotify*");
+					cparam_map.set (get_param_pos (d.cdelegate_target_parameter_position + 0.01), cparam);
+				}
 			}
 		} else if (d.return_type.is_real_non_null_struct_type ()) {
 			var cparam = new CCodeParameter ("result", "%s*".printf (d.return_type.get_cname ()));
@@ -345,6 +353,10 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
 			if (deleg_type.delegate_symbol.has_target) {
 				var ctarget = new CCodeIdentifier (get_delegate_target_cname ("result"));
 				carg_map.set (get_param_pos (m.cdelegate_target_parameter_position), ctarget);
+				if (deleg_type.value_owned) {
+					var ctarget_destroy_notify = new CCodeIdentifier (get_delegate_target_destroy_notify_cname ("result"));
+					carg_map.set (get_param_pos (m.cdelegate_target_parameter_position + 0.01), ctarget_destroy_notify);
+				}
 			}
 		} else if (m.return_type.is_real_non_null_struct_type ()) {
 			carg_map.set (get_param_pos (-3), new CCodeIdentifier ("result"));