diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-10-31 10:39:44 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2019-11-07 12:11:48 +0100 |
| commit | 28a5a407e796df8a26916d1db9e05d6d7bccbd7a (patch) | |
| tree | 86dcbe786c3881fe99b68cd1021e8fcc57803e9c | |
| parent | fe7c88fe4360084ad0f239413057f6671c9b422f (diff) | |
| download | vala-28a5a407e796df8a26916d1db9e05d6d7bccbd7a.tar.gz | |
codegen: Fix setting of generic-type properties for gobject style chain up
Correctly refer to their canonical names.
See https://bugzilla.gnome.org/show_bug.cgi?id=654702
| -rw-r--r-- | codegen/valaccodebasemodule.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala index 54bf70bc5..f23c42b42 100644 --- a/codegen/valaccodebasemodule.vala +++ b/codegen/valaccodebasemodule.vala @@ -4714,10 +4714,10 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator { int type_param_index = 0; foreach (var type_arg in type_args) { if (type_parameters != null) { - var type_param_name = type_parameters.get (type_param_index).name.down (); - arg_map.set (get_param_pos (0.1 * type_param_index + 0.01), new CCodeConstant ("\"%s_type\"".printf (type_param_name))); - arg_map.set (get_param_pos (0.1 * type_param_index + 0.03), new CCodeConstant ("\"%s_dup_func\"".printf (type_param_name))); - arg_map.set (get_param_pos (0.1 * type_param_index + 0.05), new CCodeConstant ("\"%s_destroy_func\"".printf (type_param_name))); + var type_param_name = type_parameters.get (type_param_index).name.down ().replace ("_", "-"); + arg_map.set (get_param_pos (0.1 * type_param_index + 0.01), new CCodeConstant ("\"%s-type\"".printf (type_param_name))); + arg_map.set (get_param_pos (0.1 * type_param_index + 0.03), new CCodeConstant ("\"%s-dup-func\"".printf (type_param_name))); + arg_map.set (get_param_pos (0.1 * type_param_index + 0.05), new CCodeConstant ("\"%s-destroy-func\"".printf (type_param_name))); } arg_map.set (get_param_pos (0.1 * type_param_index + 0.02), get_type_id_expression (type_arg, is_chainup)); |