From: Luca Bruno <lucabru@src.gnome.org>
Date: Sun, 9 Jan 2011 12:57:59 +0000 (+0100)
Subject: Support owned delegate parameters in delegates.
X-Git-Tag: 0.11.4~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb97c1e59acf6dbef9236c75240fb356bfd2afaf;p=thirdparty%2Fvala.git

Support owned delegate parameters in delegates.

Fixes bug 639059.
---

diff --git a/codegen/valaccodedelegatemodule.vala b/codegen/valaccodedelegatemodule.vala
index 5e978f083..fcf8bcc1f 100644
--- a/codegen/valaccodedelegatemodule.vala
+++ b/codegen/valaccodedelegatemodule.vala
@@ -73,6 +73,10 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
 				if (param_d.has_target) {
 					cparam = new CCodeParameter (get_delegate_target_cname (get_variable_cname (param.name)), "void*");
 					cfundecl.add_parameter (cparam);
+					if (deleg_type.value_owned) {
+						cparam = new CCodeParameter (get_delegate_target_destroy_notify_cname (get_variable_cname (param.name)), "GDestroyNotify*");
+						cfundecl.add_parameter (cparam);
+					}
 				}
 			}
 		}
@@ -331,6 +335,10 @@ public class Vala.CCodeDelegateModule : CCodeArrayModule {
 				if (deleg_type.delegate_symbol.has_target) {
 					var ctarget = new CCodeIdentifier (get_delegate_target_cname (d_params.get (i).name));
 					carg_map.set (get_param_pos (param.cdelegate_target_parameter_position), ctarget);
+					if (deleg_type.value_owned) {
+						var ctarget_destroy_notify = new CCodeIdentifier (get_delegate_target_destroy_notify_cname (d_params.get (i).name));
+						carg_map.set (get_param_pos (m.cdelegate_target_parameter_position + 0.01), ctarget_destroy_notify);
+					}
 				}
 			}