Fix array and delegate arguments in creation and virtual methods

diff --git a/gobject/valaccodearraymodule.vala b/gobject/valaccodearraymodule.vala
index 72499af084d83921759b963131c456eaf6cf33eb..ee113710334f12dcd3205b22ccfce80060a3b63d 100644 (file)
--- a/gobject/valaccodearraymodule.vala
+++ b/gobject/valaccodearraymodule.vala
@@ -891,7 +891,7 @@ internal class Vala.CCodeArrayModule : CCodeMethodCallModule {
                                var cparam = new CCodeFormalParameter (head.get_array_length_cname (get_variable_cname (param.name), dim), length_ctype);
                                cparam_map.set (get_param_pos (param.carray_length_parameter_position + 0.01 * dim), cparam);
                                if (carg_map != null) {
-                                       carg_map.set (get_param_pos (param.carray_length_parameter_position + 0.01 * dim), get_variable_cexpression (param.name));
+                                       carg_map.set (get_param_pos (param.carray_length_parameter_position + 0.01 * dim), get_variable_cexpression (cparam.name));
                                }
                        }
                }

diff --git a/gobject/valaccodedelegatemodule.vala b/gobject/valaccodedelegatemodule.vala
index d427e687219031dc1cc092cdac84c3dd18f6efbe..1eab032ab0436a9993817a3132b9056971a973a2 100644 (file)
--- a/gobject/valaccodedelegatemodule.vala
+++ b/gobject/valaccodedelegatemodule.vala
@@ -422,13 +422,13 @@ internal class Vala.CCodeDelegateModule : CCodeArrayModule {
                                var cparam = new CCodeFormalParameter (get_delegate_target_cname (get_variable_cname (param.name)), "void*");
                                cparam_map.set (get_param_pos (param.cdelegate_target_parameter_position), cparam);
                                if (carg_map != null) {
-                                       carg_map.set (get_param_pos (param.cdelegate_target_parameter_position), get_variable_cexpression (param.name));
+                                       carg_map.set (get_param_pos (param.cdelegate_target_parameter_position), get_variable_cexpression (cparam.name));
                                }
                                if (deleg_type.value_owned) {
                                        cparam = new CCodeFormalParameter (get_delegate_target_destroy_notify_cname (get_variable_cname (param.name)), "GDestroyNotify");
                                        cparam_map.set (get_param_pos (param.cdelegate_target_parameter_position + 0.01), cparam);
                                        if (carg_map != null) {
-                                               carg_map.set (get_param_pos (param.cdelegate_target_parameter_position + 0.01), get_variable_cexpression (param.name));
+                                               carg_map.set (get_param_pos (param.cdelegate_target_parameter_position + 0.01), get_variable_cexpression (cparam.name));
                                        }
                                }
                        }
@@ -436,7 +436,7 @@ internal class Vala.CCodeDelegateModule : CCodeArrayModule {
                        var cparam = new CCodeFormalParameter (get_delegate_target_cname (get_variable_cname (param.name)), "void*");
                        cparam_map.set (get_param_pos (param.cdelegate_target_parameter_position), cparam);
                        if (carg_map != null) {
-                               carg_map.set (get_param_pos (param.cdelegate_target_parameter_position), get_variable_cexpression (param.name));
+                               carg_map.set (get_param_pos (param.cdelegate_target_parameter_position), get_variable_cexpression (cparam.name));
                        }
                }
        }