diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-06-06 17:39:41 +0200 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-06-07 08:11:31 +0200 |
| commit | 9bee48897a2a77fd8be3ab77379190cd3a3ff9ba (patch) | |
| tree | 7503144f4f675b25f24a37d65f793b0c02d724a9 /codegen/valagsignalmodule.vala | |
| parent | a30c392efff037c4331d22fd7b9b03e85b0eb640 (diff) | |
| download | vala-9bee48897a2a77fd8be3ab77379190cd3a3ff9ba.tar.gz | |
codegen: Support renamed signals
The CCode attribute 'cname' needs to be the canonical representation as it
is expected in C.
https://bugzilla.gnome.org/show_bug.cgi?id=731547
Diffstat (limited to 'codegen/valagsignalmodule.vala')
| -rw-r--r-- | codegen/valagsignalmodule.vala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala index 00c06c196..1c0eff476 100644 --- a/codegen/valagsignalmodule.vala +++ b/codegen/valagsignalmodule.vala @@ -145,7 +145,7 @@ public class Vala.GSignalModule : GObjectModule { private CCodeExpression get_signal_id_cexpression (Signal sig) { var cl = (TypeSymbol) sig.parent_symbol; var signal_array = new CCodeIdentifier ("%s_signals".printf (get_ccode_lower_case_name (cl))); - var signal_enum_value = new CCodeIdentifier ("%s_%s_SIGNAL".printf (get_ccode_upper_case_name (cl), sig.name.ascii_up ())); + var signal_enum_value = new CCodeIdentifier ("%s_%s_SIGNAL".printf (get_ccode_upper_case_name (cl), get_ccode_upper_case_name (sig))); return new CCodeElementAccess (signal_array, signal_enum_value); } @@ -189,7 +189,7 @@ public class Vala.GSignalModule : GObjectModule { } } - signal_enum.add_value (new CCodeEnumValue ("%s_%s_SIGNAL".printf (get_ccode_upper_case_name ((TypeSymbol)sig.parent_symbol), sig.name.ascii_up ()))); + signal_enum.add_value (new CCodeEnumValue ("%s_%s_SIGNAL".printf (get_ccode_upper_case_name ((TypeSymbol)sig.parent_symbol), get_ccode_upper_case_name (sig)))); sig.accept_children (this); @@ -569,7 +569,7 @@ public class Vala.GSignalModule : GObjectModule { } emitter_func = get_ccode_lower_case_name (sig.emitter); } else { - emitter_func = "%s_%s".printf (get_ccode_lower_case_name (cl), sig.name); + emitter_func = "%s_%s".printf (get_ccode_lower_case_name (cl), get_ccode_lower_case_name (sig)); } var ccall = new CCodeFunctionCall (new CCodeIdentifier (emitter_func)); @@ -670,7 +670,7 @@ public class Vala.GSignalModule : GObjectModule { // dynamic_signal_connect or dynamic_signal_disconnect // second argument: signal name - ccall.add_argument (new CCodeConstant ("\"%s\"".printf (sig.name))); + ccall.add_argument (new CCodeConstant ("\"%s\"".printf (get_ccode_name (sig)))); } else if (!disconnect) { // g_signal_connect_object or g_signal_connect |