gsignal: Use guint to represent flags-enum in custom GMarshalFunc

diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
index fd1a1129d8c1d794b0c6d18bdad2ea33eeb1aa6c..e3a12f58faa5383ce7bfe16ad86505f18de20a75 100644 (file)
--- a/codegen/valagsignalmodule.vala
+++ b/codegen/valagsignalmodule.vala
@@ -68,7 +68,12 @@ public class Vala.GSignalModule : GObjectModule {
                                return "gpointer";
                        }
                } else if (t.data_type is Enum) {
-                       return "gint";
+                       var en = (Enum) t.data_type;
+                       if (en.is_flags) {
+                               return "guint";
+                       } else {
+                               return "gint";
+                       }
                } else if (t is ArrayType) {
                        return "gpointer";
                } else if (t is ErrorType) {

diff --git a/tests/Makefile.am b/tests/Makefile.am
index caea87f06abe4040d4b6ebbf4794452bee633159..9de37647440744f3928cd9d3dc3cc6c779e6041f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -277,6 +277,7 @@ TESTS = \
        objects/property-static.vala \
        objects/regex.vala \
        objects/signals.vala \
+       objects/signals-enum-marshal.vala \
        objects/signals-delegate.vala \
        objects/signals-lambda-delegate.vala \
        objects/test-025.vala \

diff --git a/tests/objects/signals-enum-marshal.vala b/tests/objects/signals-enum-marshal.vala
new file mode 100644 (file)
index 0000000..412fa18
--- /dev/null
+++ b/tests/objects/signals-enum-marshal.vala
@@ -0,0 +1,21 @@
+enum Foo {
+       FOO
+}
+
+[Flags]
+enum Bar {
+       BAR
+}
+
+class Manam : Object {
+       public signal void foo (Foo f, string s);
+       public signal void bar (Bar b, string s);
+}
+
+void main () {
+       var manam = new Manam ();
+       manam.foo.connect (() => {});
+       manam.foo (Foo.FOO, "foo");
+       manam.bar.connect (() => {});
+       manam.bar (Bar.BAR, "bar");
+}