Fix marshaller signature for signals with array parameters

Fixes bug 604829.

diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
index 2605f2b74237a1e9fe7c1baef20c7fc386734c02..c3fb1c8caeb86bfca8127cc7b8cc302d30bcd53c 100644 (file)
--- a/codegen/valagsignalmodule.vala
+++ b/codegen/valagsignalmodule.vala
@@ -34,9 +34,9 @@ public class Vala.GSignalModule : GObjectModule {
                                return ("BOXED");
                        } else {
                                if (((ArrayType) t).element_type.data_type == string_type.data_type) {
-                                       return ("BOXED_INT");
+                                       return ("BOXED,INT");
                                } else {
-                                       return ("POINTER_INT");
+                                       return ("POINTER,INT");
                                }
                        }
                } else if (t is VoidType) {
@@ -85,7 +85,7 @@ public class Vala.GSignalModule : GObjectModule {
                        ret = ret + "_VOID";
                } else {
                        foreach (FormalParameter p in params) {
-                               ret = "%s_%s".printf (ret, get_marshaller_type_name_for_parameter (p, dbus));
+                               ret = "%s_%s".printf (ret, get_marshaller_type_name_for_parameter (p, dbus).replace (",", "_"));
                        }
                }