[vala/staging] glib-2.0: Drop type_id from GLib.Error, let it be handled internally



commit 29052f89deb9d4b961c030f5b7a86996663fba69
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Mon Jul 20 10:37:53 2020 +0200

    glib-2.0: Drop type_id from GLib.Error, let it be handled internally
    
    Regression of 4db1b33e7a8424e12abc85342111e75bd07c7aa9
    
    Fixes https://gitlab.gnome.org/GNOME/vala/issues/1039

 tests/Makefile.am                        |  1 +
 tests/objects/signals-error-marshal.vala | 26 ++++++++++++++++++++++++++
 vapi/glib-2.0.vapi                       |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c3fb9cfdc..48f163e86 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -436,6 +436,7 @@ TESTS = \
        objects/signals-delegate.vala \
        objects/signals-delegate-parameter.vala \
        objects/signals-dymanic-invalid-handler.test \
+       objects/signals-error-marshal.vala \
        objects/signals-fundamental-return.vala \
        objects/signals-gobject-return.vala \
        objects/signals-lambda-delegate.vala \
diff --git a/tests/objects/signals-error-marshal.vala b/tests/objects/signals-error-marshal.vala
new file mode 100644
index 000000000..b727777e2
--- /dev/null
+++ b/tests/objects/signals-error-marshal.vala
@@ -0,0 +1,26 @@
+errordomain FooError {
+       BAD;
+}
+
+struct Bar {
+       public int i;
+}
+
+class Foo : GLib.Object {
+       signal void foo (void* p, Bar bar);
+       signal void bar (void* p, Error e);
+
+       public Foo () {
+               bar.connect (callback);
+               bar (null, new FooError.BAD ("bad"));
+       }
+
+       void callback (void* p, Error e) {
+               assert (p == null);
+               assert (e.code == FooError.BAD);
+       }
+}
+
+void main() {
+       var foo = new Foo ();
+}
diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 45dbc0923..38d1872d9 100644
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -2590,7 +2590,7 @@ namespace GLib {
 
        [Compact]
        [ErrorBase]
-       [CCode (copy_function = "g_error_copy", free_function = "g_error_free", type_id = "G_TYPE_ERROR")]
+       [CCode (copy_function = "g_error_copy", free_function = "g_error_free")]
        public class Error {
                [PrintfFormat]
                public Error (Quark domain, int code, string format, ...);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]