From ad5927f4fcec183cbbe4b4e3e57632892ac31f41 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 15 Oct 2019 08:18:45 +0200 Subject: [PATCH 1/6] glib-2.0: Annotate error-domains with "has_type_id = false" --- vapi/glib-2.0.vapi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index c27080263..57ed84238 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -2177,6 +2177,7 @@ namespace GLib { public delegate bool SourceFunc (); + [CCode (has_type_id = false)] public errordomain ThreadError { AGAIN; public static GLib.Quark quark (); @@ -2625,6 +2626,7 @@ namespace GLib { AGAIN } + [CCode (has_type_id = false)] public errordomain IOChannelError { FBIG, INVAL, @@ -2961,6 +2963,7 @@ namespace GLib { public static string canonicalize (string filename, string? relative_to = null); } + [CCode (has_type_id = false)] public errordomain ConvertError { NO_CONVERSION, ILLEGAL_SEQUENCE, @@ -3762,6 +3765,7 @@ namespace GLib { /* Spawning Processes */ + [CCode (has_type_id = false)] public errordomain SpawnError { FORK, READ, @@ -3883,6 +3887,7 @@ namespace GLib { /* File Utilities */ + [CCode (has_type_id = false)] public errordomain FileError { EXIST, ISDIR, @@ -4273,6 +4278,7 @@ namespace GLib { /* Shell-related Utilities */ + [CCode (has_type_id = false)] public errordomain ShellError { BAD_QUOTING, EMPTY_STRING, @@ -4288,6 +4294,7 @@ namespace GLib { /* Commandline option parser */ + [CCode (has_type_id = false)] public errordomain OptionError { UNKNOWN_OPTION, BAD_VALUE, @@ -4400,6 +4407,7 @@ namespace GLib { /* Perl-compatible regular expressions */ + [CCode (has_type_id = false)] [Version (since = "2.14")] public errordomain RegexError { COMPILE, @@ -4566,6 +4574,7 @@ namespace GLib { /* Simple XML Subset Parser See http://live.gnome.org/Vala/MarkupSample for an example */ + [CCode (has_type_id = false)] public errordomain MarkupError { BAD_UTF8, EMPTY, @@ -4653,6 +4662,7 @@ namespace GLib { /* Key-value file parser */ + [CCode (has_type_id = false)] public errordomain KeyFileError { UNKNOWN_ENCODING, PARSE, @@ -4849,6 +4859,7 @@ namespace GLib { public bool move_item (string old_uri, string new_uri) throws BookmarkFileError; } + [CCode (has_type_id = false)] public errordomain BookmarkFileError { INVALID_URI, INVALID_VALUE, @@ -6530,6 +6541,7 @@ namespace GLib { public static void parse_error_print_context (GLib.VariantParseError error, string source_str); } + [CCode (has_type_id = false)] [Version (since = "2.24")] public errordomain VariantParseError { FAILED, @@ -6622,6 +6634,7 @@ namespace GLib { }); } + [CCode (has_type_id = false)] [Version (since = "2.54")] public errordomain NumberParserError { INVALID, -- GitLab From 1f4ae3f7425361598d05501b144bb612a97ec5ba Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 15 Oct 2019 08:27:05 +0200 Subject: [PATCH 2/6] glib-2.0: Add type_id of GLib.Error --- vapi/glib-2.0.vapi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index 57ed84238..e22acacdd 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -2671,7 +2671,7 @@ namespace GLib { [Compact] [ErrorBase] - [CCode (copy_function = "g_error_copy", free_function = "g_error_free")] + [CCode (copy_function = "g_error_copy", free_function = "g_error_free", type_id = "G_TYPE_ERROR")] public class Error { [PrintfFormat] public Error (Quark domain, int code, string format, ...); -- GitLab From a1530007a7c1b829cdf5876f4090d30b502c1bc3 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 3 Oct 2019 16:50:16 +0200 Subject: [PATCH 3/6] codegen: Default to "has_type_id = false" for external error-domains --- codegen/valaccode.vala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/codegen/valaccode.vala b/codegen/valaccode.vala index 9b1da33f7..80e0f1c0f 100644 --- a/codegen/valaccode.vala +++ b/codegen/valaccode.vala @@ -445,7 +445,11 @@ namespace Vala { } public static bool get_ccode_has_type_id (TypeSymbol sym) { - return sym.get_attribute_bool ("CCode", "has_type_id", true); + if (sym is ErrorDomain && sym.external_package) { + return sym.get_attribute_bool ("CCode", "has_type_id", false); + } else { + return sym.get_attribute_bool ("CCode", "has_type_id", true); + } } public static bool get_ccode_has_new_function (Method m) { -- GitLab From da4ff03c5ca427cf7cc4574f52f5190dc1b0dfb9 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sat, 17 Nov 2018 22:22:03 +0100 Subject: [PATCH 4/6] codegen: Emit GType definition for error domains Fixes https://gitlab.gnome.org/GNOME/vala/issues/699 --- codegen/Makefile.am | 1 + codegen/valaccode.vala | 2 +- codegen/valaccodeattribute.vala | 13 +++-- codegen/valaerrordomainregisterfunction.vala | 51 +++++++++++++++++++ codegen/valagerrormodule.vala | 25 +++++++++ codegen/valagirwriter.vala | 6 ++- codegen/valagtypemodule.vala | 12 +++++ codegen/valatyperegisterfunction.vala | 30 +++++++++++ tests/asynchronous/bug793158.c-expected | 25 +++++++++ .../asynchronous/catch-error-scope.c-expected | 26 +++++++++- .../asynchronous/catch-in-finally.c-expected | 26 +++++++++- .../out-parameter-free-on-error.c-expected | 25 +++++++++ tests/basic-types/default-gtype.c-expected | 25 +++++++++ tests/control-flow/bug764440.c-expected | 25 +++++++++ tests/control-flow/lock-if-throw.c-expected | 25 +++++++++ tests/dbus/errors_client.c-expected | 4 ++ tests/dbus/errors_server.c-expected | 4 ++ tests/delegates/error-pos.c-expected | 26 +++++++++- .../params-array-with-throws.c-expected | 24 +++++++++ tests/delegates/variadic.c-expected | 25 +++++++++ tests/errors/bug567181.c-expected | 25 +++++++++ tests/errors/bug579101.c-expected | 24 +++++++++ tests/errors/bug623049.c-expected | 25 +++++++++ tests/errors/bug778224.c-expected | 25 +++++++++ tests/errors/catch-error-code.c-expected | 25 +++++++++ tests/errors/catch-in-finally.c-expected | 24 +++++++++ tests/errors/default-gtype.c-expected | 23 +++++++++ .../delegate-throws-error-code.c-expected | 24 +++++++++ tests/errors/errorcode.c-expected | 24 +++++++++ .../errordomain-static-method.c-expected | 24 +++++++++ tests/errors/errordomain.c-expected | 25 +++++++++ tests/errors/errors.c-expected | 25 +++++++++ tests/errors/loops.c-expected | 24 +++++++++ .../method-throws-error-code.c-expected | 25 +++++++++ tests/errors/unhandled.c-expected | 25 +++++++++ tests/genie/exception.c-expected | 24 +++++++++ tests/girwriter/GirTest-1.0.gir-expected | 9 +++- tests/girwriter/girtest.vala | 7 +++ tests/girwriter/girtest.vapi-expected | 6 +++ tests/girwriter/girtest.vapigen-expected | 10 +++- tests/methods/bug781061.c-expected | 25 +++++++++ .../parameter-out-free-on-error.c-expected | 25 +++++++++ .../params-array-with-throws.c-expected | 27 +++++++++- tests/methods/print-attribute.c-expected | 25 +++++++++ .../objects/signals-error-marshal.c-expected | 25 +++++++++ vala/valaerrorcode.vala | 16 ++++++ 46 files changed, 953 insertions(+), 13 deletions(-) create mode 100644 codegen/valaerrordomainregisterfunction.vala diff --git a/codegen/Makefile.am b/codegen/Makefile.am index c7fc91341..b786e66ec 100644 --- a/codegen/Makefile.am +++ b/codegen/Makefile.am @@ -40,6 +40,7 @@ libvalaccodegen_la_VALASOURCES = \ valaclassregisterfunction.vala \ valactype.vala \ valaenumregisterfunction.vala \ + valaerrordomainregisterfunction.vala \ valagasyncmodule.vala \ valagdbusclientmodule.vala \ valagdbusmodule.vala \ diff --git a/codegen/valaccode.vala b/codegen/valaccode.vala index 80e0f1c0f..25a0d11af 100644 --- a/codegen/valaccode.vala +++ b/codegen/valaccode.vala @@ -237,7 +237,7 @@ namespace Vala { } public static string get_ccode_type_function (TypeSymbol sym) { - assert (!((sym is Class && ((Class) sym).is_compact) || sym is ErrorCode || sym is ErrorDomain || sym is Delegate)); + assert (!((sym is Class && ((Class) sym).is_compact) || sym is ErrorCode || sym is Delegate)); return "%s_get_type".printf (get_ccode_lower_case_name (sym)); } diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala index bd4c6b29d..3c3b18ef4 100644 --- a/codegen/valaccodeattribute.vala +++ b/codegen/valaccodeattribute.vala @@ -1073,6 +1073,13 @@ public class Vala.CCodeAttribute : AttributeCache { } else { return en.is_flags ? "G_TYPE_UINT" : "G_TYPE_INT"; } + } else if (sym is ErrorDomain) { + unowned ErrorDomain edomain = (ErrorDomain) sym; + if (get_ccode_has_type_id (edomain)) { + return get_ccode_upper_case_name (edomain, "TYPE_"); + } else { + return "G_TYPE_ERROR"; + } } else { return "G_TYPE_POINTER"; } @@ -1199,7 +1206,7 @@ public class Vala.CCodeAttribute : AttributeCache { return get_ccode_lower_case_name (cl, "value_get_"); } else if (cl.base_class != null) { return get_ccode_get_value_function (cl.base_class); - } else if (type_id == "G_TYPE_POINTER") { + } else if (type_id == "G_TYPE_POINTER" || cl.is_error_base) { return "g_value_get_pointer"; } else { return "g_value_get_boxed"; @@ -1257,7 +1264,7 @@ public class Vala.CCodeAttribute : AttributeCache { return get_ccode_lower_case_name (cl, "value_set_"); } else if (cl.base_class != null) { return get_ccode_set_value_function (cl.base_class); - } else if (type_id == "G_TYPE_POINTER") { + } else if (type_id == "G_TYPE_POINTER" || cl.is_error_base) { return "g_value_set_pointer"; } else { return "g_value_set_boxed"; @@ -1315,7 +1322,7 @@ public class Vala.CCodeAttribute : AttributeCache { return get_ccode_lower_case_name (cl, "value_take_"); } else if (cl.base_class != null) { return get_ccode_take_value_function (cl.base_class); - } else if (type_id == "G_TYPE_POINTER") { + } else if (type_id == "G_TYPE_POINTER" || cl.is_error_base) { return "g_value_set_pointer"; } else { return "g_value_take_boxed"; diff --git a/codegen/valaerrordomainregisterfunction.vala b/codegen/valaerrordomainregisterfunction.vala new file mode 100644 index 000000000..b4be3295e --- /dev/null +++ b/codegen/valaerrordomainregisterfunction.vala @@ -0,0 +1,51 @@ +/* valaerrordomainregisterfunction.vala + * + * Copyright (C) 2018 Rico Tzschichholz + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: + * Rico Tzschichholz + */ + +using GLib; + +/** + * C function to register an error domain at runtime. + */ +public class Vala.ErrorDomainRegisterFunction : TypeRegisterFunction { + /** + * Specifies the error domain to be registered. + */ + public weak ErrorDomain error_domain_reference { get; set; } + + /** + * Creates a new C function to register the specified error domain at runtime. + * + * @param edomain an error domain + * @return newly created error domain register function + */ + public ErrorDomainRegisterFunction (ErrorDomain edomain) { + error_domain_reference = edomain; + } + + public override TypeSymbol get_type_declaration () { + return error_domain_reference; + } + + public override SymbolAccessibility get_accessibility () { + return error_domain_reference.access; + } +} diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala index a559a4d00..2b4c6cf85 100644 --- a/codegen/valagerrormodule.vala +++ b/codegen/valagerrormodule.vala @@ -56,6 +56,31 @@ public class Vala.GErrorModule : CCodeDelegateModule { requires_vala_extern = true; decl_space.add_function_declaration (cquark_fun); + decl_space.add_type_definition (new CCodeNewline ()); + + if (!get_ccode_has_type_id (edomain)) { + return; + } + + decl_space.add_include ("glib-object.h"); + decl_space.add_type_declaration (new CCodeNewline ()); + + var fun_name = get_ccode_type_function (edomain); + + var macro = "(%s ())".printf (fun_name); + decl_space.add_type_declaration (new CCodeMacroReplacement (get_ccode_type_id (edomain), macro)); + + var regfun = new CCodeFunction (fun_name, "GType"); + regfun.modifiers = CCodeModifiers.CONST; + + if (edomain.is_private_symbol ()) { + // avoid C warning as this function is not always used + regfun.modifiers |= CCodeModifiers.STATIC | CCodeModifiers.UNUSED; + } else if (context.hide_internal && edomain.is_internal_symbol ()) { + regfun.modifiers |= CCodeModifiers.INTERNAL; + } + + decl_space.add_function_declaration (regfun); } public override void visit_error_domain (ErrorDomain edomain) { diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala index 696c6c8a6..115d4ff98 100644 --- a/codegen/valagirwriter.vala +++ b/codegen/valagirwriter.vala @@ -932,7 +932,11 @@ public class Vala.GIRWriter : CodeVisitor { write_indent (); buffer.append_printf ("\n"); diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala index 28a29744c..7bc8eaf83 100644 --- a/codegen/valagtypemodule.vala +++ b/codegen/valagtypemodule.vala @@ -2408,6 +2408,18 @@ public class Vala.GTypeModule : GErrorModule { } } + public override void visit_error_domain (ErrorDomain edomain) { + base.visit_error_domain (edomain); + + if (get_ccode_has_type_id (edomain)) { + push_line (edomain.source_reference); + var type_fun = new ErrorDomainRegisterFunction (edomain); + type_fun.init_from_type (context, false, false); + cfile.add_type_member_definition (type_fun.get_definition ()); + pop_line (); + } + } + public override void visit_method_call (MethodCall expr) { var ma = expr.call as MemberAccess; var mtype = expr.call.value_type as MethodType; diff --git a/codegen/valatyperegisterfunction.vala b/codegen/valatyperegisterfunction.vala index a3236b94c..7502294cb 100644 --- a/codegen/valatyperegisterfunction.vala +++ b/codegen/valatyperegisterfunction.vala @@ -155,6 +155,8 @@ public abstract class Vala.TypeRegisterFunction { } else { reg_call = new CCodeFunctionCall (new CCodeIdentifier ("g_enum_register_static")); } + } else if (type_symbol is ErrorDomain) { + reg_call = new CCodeFunctionCall (new CCodeIdentifier ("g_enum_register_static")); } else if (fundamental) { reg_call = new CCodeFunctionCall (new CCodeIdentifier ("g_type_register_fundamental")); reg_call.add_argument (new CCodeFunctionCall (new CCodeIdentifier ("g_type_fundamental_next"))); @@ -203,6 +205,34 @@ public abstract class Vala.TypeRegisterFunction { type_init.add_statement (cdecl); + reg_call.add_argument (new CCodeIdentifier ("values")); + } else if (type_symbol is ErrorDomain) { + unowned ErrorDomain edomain = (ErrorDomain) type_symbol; + var clist = new CCodeInitializerList (); /* or during visit time? */ + + CCodeInitializerList clist_ec = null; + foreach (ErrorCode ec in edomain.get_codes ()) { + clist_ec = new CCodeInitializerList (); + clist_ec.append (new CCodeConstant (get_ccode_name (ec))); + clist_ec.append (new CCodeConstant ("\"%s\"".printf (get_ccode_name (ec)))); + clist_ec.append (new CCodeConstant ("\"%s\"".printf (ec.nick))); + clist.append (clist_ec); + } + + clist_ec = new CCodeInitializerList (); + clist_ec.append (new CCodeConstant ("0")); + clist_ec.append (new CCodeConstant ("NULL")); + clist_ec.append (new CCodeConstant ("NULL")); + clist.append (clist_ec); + + var edomain_decl = new CCodeVariableDeclarator ("values[]", clist); + + cdecl = new CCodeDeclaration ("const GEnumValue"); + cdecl.add_declarator (edomain_decl); + cdecl.modifiers = CCodeModifiers.STATIC; + + type_init.add_statement (cdecl); + reg_call.add_argument (new CCodeIdentifier ("values")); } else { reg_call.add_argument (new CCodeIdentifier ("&g_define_type_info")); diff --git a/tests/asynchronous/bug793158.c-expected b/tests/asynchronous/bug793158.c-expected index 218575392..8ad749607 100644 --- a/tests/asynchronous/bug793158.c-expected +++ b/tests/asynchronous/bug793158.c-expected @@ -15,6 +15,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_FOO (foo_get_type ()) #define FOO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FOO, Foo)) #define FOO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FOO, FooClass)) @@ -38,6 +40,7 @@ typedef enum { FOO_ERROR_BAR } FooError; #define FOO_ERROR foo_error_quark () + struct _Foo { GObject parent_instance; FooPrivate * priv; @@ -61,6 +64,7 @@ VALA_EXTERN GMainLoop* loop; GMainLoop* loop = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref) static void foo_bar_data_free (gpointer _data); @@ -87,6 +91,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAR, "FOO_ERROR_BAR", "bar"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static void foo_bar_data_free (gpointer _data) { diff --git a/tests/asynchronous/catch-error-scope.c-expected b/tests/asynchronous/catch-error-scope.c-expected index 289b79029..4f15904f8 100644 --- a/tests/asynchronous/catch-error-scope.c-expected +++ b/tests/asynchronous/catch-error-scope.c-expected @@ -2,10 +2,10 @@ * generated from asynchronous_catch_error_scope.vala, do not modify */ #include +#include #include #include #include -#include #if !defined(VALA_EXTERN) #if defined(_MSC_VER) @@ -17,6 +17,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _FooData FooData; typedef struct _Block1Data Block1Data; @@ -30,6 +31,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _FooData { int _state_; GObject* _source_object_; @@ -50,6 +52,7 @@ struct _Block1Data { }; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; static void foo_data_free (gpointer _data); VALA_EXTERN void foo (GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -71,6 +74,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static void foo_data_free (gpointer _data) { diff --git a/tests/asynchronous/catch-in-finally.c-expected b/tests/asynchronous/catch-in-finally.c-expected index 9779a393a..ca37912bb 100644 --- a/tests/asynchronous/catch-in-finally.c-expected +++ b/tests/asynchronous/catch-in-finally.c-expected @@ -2,8 +2,8 @@ * generated from asynchronous_catch_in_finally.vala, do not modify */ #include -#include #include +#include #include #include @@ -17,6 +17,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) typedef struct _FailData FailData; typedef struct _MayFailData MayFailData; typedef struct _FooData FooData; @@ -33,6 +34,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _FailData { int _state_; GObject* _source_object_; @@ -78,6 +80,7 @@ VALA_EXTERN GMainLoop* loop; GMainLoop* loop = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; static void fail_data_free (gpointer _data); VALA_EXTERN void fail (GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -131,6 +134,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static void fail_data_free (gpointer _data) { diff --git a/tests/asynchronous/out-parameter-free-on-error.c-expected b/tests/asynchronous/out-parameter-free-on-error.c-expected index f6468651b..a4673d0a8 100644 --- a/tests/asynchronous/out-parameter-free-on-error.c-expected +++ b/tests/asynchronous/out-parameter-free-on-error.c-expected @@ -15,6 +15,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_MANAM (manam_get_type ()) #define MANAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MANAM, Manam)) #define MANAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MANAM, ManamClass)) @@ -43,6 +45,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _Manam { GObject parent_instance; ManamPrivate * priv; @@ -82,6 +85,7 @@ VALA_EXTERN GMainLoop* loop; GMainLoop* loop = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType manam_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Manam, g_object_unref) VALA_EXTERN Manam* manam_new (void); @@ -111,6 +115,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + Manam* manam_construct (GType object_type) { diff --git a/tests/basic-types/default-gtype.c-expected b/tests/basic-types/default-gtype.c-expected index 4d1268f2e..995f00be5 100644 --- a/tests/basic-types/default-gtype.c-expected +++ b/tests/basic-types/default-gtype.c-expected @@ -35,6 +35,8 @@ typedef enum { #define TYPE_FOO_FLAG (foo_flag_get_type ()) +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_FOO_STRUCT (foo_struct_get_type ()) typedef struct _FooStruct FooStruct; typedef enum { @@ -60,6 +62,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _FooStruct { gint i; }; @@ -77,6 +80,7 @@ static GType ifoo_get_type_once (void); VALA_EXTERN GType foo_enum_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType foo_flag_get_type (void) G_GNUC_CONST ; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType foo_struct_get_type (void) G_GNUC_CONST ; VALA_EXTERN FooStruct* foo_struct_dup (const FooStruct* self); VALA_EXTERN void foo_struct_free (FooStruct* self); @@ -159,6 +163,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + FooStruct* foo_struct_dup (const FooStruct* self) { diff --git a/tests/control-flow/bug764440.c-expected b/tests/control-flow/bug764440.c-expected index b49776996..e5e3b5b8a 100644 --- a/tests/control-flow/bug764440.c-expected +++ b/tests/control-flow/bug764440.c-expected @@ -2,6 +2,7 @@ * generated from control_flow_bug764440.vala, do not modify */ #include +#include #include #include @@ -15,12 +16,15 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + typedef enum { FOO_ERROR_BAR } FooError; #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN const gchar* get_bar (GError** error); static void _vala_main (void); @@ -30,6 +34,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAR, "FOO_ERROR_BAR", "bar"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + const gchar* get_bar (GError** error) { diff --git a/tests/control-flow/lock-if-throw.c-expected b/tests/control-flow/lock-if-throw.c-expected index ee259cffc..7912c9826 100644 --- a/tests/control-flow/lock-if-throw.c-expected +++ b/tests/control-flow/lock-if-throw.c-expected @@ -15,6 +15,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_FOO (foo_get_type ()) #define FOO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FOO, Foo)) #define FOO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FOO, FooClass)) @@ -32,6 +34,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _Foo { GTypeInstance parent_instance; volatile int ref_count; @@ -56,6 +59,7 @@ static gint Foo_private_offset; static gpointer foo_parent_class = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN gpointer foo_ref (gpointer instance); VALA_EXTERN void foo_unref (gpointer instance); VALA_EXTERN GParamSpec* param_spec_foo (const gchar* name, @@ -84,6 +88,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static inline gpointer foo_get_instance_private (Foo* self) { diff --git a/tests/dbus/errors_client.c-expected b/tests/dbus/errors_client.c-expected index 908ddc35c..8f1209285 100644 --- a/tests/dbus/errors_client.c-expected +++ b/tests/dbus/errors_client.c-expected @@ -17,6 +17,8 @@ #endif #endif +#define TYPE_TEST_ERROR (test_error_get_type ()) + #define TYPE_TEST (test_get_type ()) #define TEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TEST, Test)) #define IS_TEST(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TEST)) @@ -42,6 +44,7 @@ typedef enum { TEST_ERROR_WORSE } TestError; #define TEST_ERROR test_error_quark () + struct _TestIface { GTypeInterface parent_iface; void (*test_void) (Test* self, GError** error); @@ -52,6 +55,7 @@ struct _TestIface { }; VALA_EXTERN GQuark test_error_quark (void); +GType test_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType test_proxy_get_type (void) G_GNUC_CONST ; VALA_EXTERN guint test_register_object (void* object, GDBusConnection* connection, diff --git a/tests/dbus/errors_server.c-expected b/tests/dbus/errors_server.c-expected index 3bcdc0c48..8406a6eab 100644 --- a/tests/dbus/errors_server.c-expected +++ b/tests/dbus/errors_server.c-expected @@ -17,6 +17,8 @@ #endif #endif +#define TYPE_TEST_ERROR (test_error_get_type ()) + #define TYPE_TEST (test_get_type ()) #define TEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TEST, Test)) #define TEST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TEST, TestClass)) @@ -47,6 +49,7 @@ typedef enum { TEST_ERROR_WORSE } TestError; #define TEST_ERROR test_error_quark () + struct _Test { GObject parent_instance; TestPrivate * priv; @@ -61,6 +64,7 @@ VALA_EXTERN GMainLoop* main_loop; GMainLoop* main_loop = NULL; VALA_EXTERN GQuark test_error_quark (void); +GType test_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType test_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Test, g_object_unref) VALA_EXTERN guint test_register_object (void* object, diff --git a/tests/delegates/error-pos.c-expected b/tests/delegates/error-pos.c-expected index 25e92dc3b..1aa5874f1 100644 --- a/tests/delegates/error-pos.c-expected +++ b/tests/delegates/error-pos.c-expected @@ -2,9 +2,9 @@ * generated from delegates_error_pos.vala, do not modify */ #include +#include #include #include -#include #include #if !defined(VALA_EXTERN) @@ -17,6 +17,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) typedef gchar* (*FooFunc) (gint i, GError** error, gpointer user_data); #define TYPE_BAR (bar_get_type ()) @@ -42,6 +43,7 @@ typedef enum { FOO_ERROR_BAR } FooError; #define FOO_ERROR foo_error_quark () + struct _Bar { GTypeInstance parent_instance; volatile int ref_count; @@ -60,6 +62,7 @@ struct _ParamSpecBar { static gpointer bar_parent_class = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN gpointer bar_ref (gpointer instance); VALA_EXTERN void bar_unref (gpointer instance); VALA_EXTERN GParamSpec* param_spec_bar (const gchar* name, @@ -97,6 +100,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAR, "FOO_ERROR_BAR", "bar"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + gchar* bar_foo (Bar* self, GError** error, diff --git a/tests/delegates/params-array-with-throws.c-expected b/tests/delegates/params-array-with-throws.c-expected index a00603906..68b33b8d7 100644 --- a/tests/delegates/params-array-with-throws.c-expected +++ b/tests/delegates/params-array-with-throws.c-expected @@ -2,6 +2,7 @@ * generated from delegates_params_array_with_throws.vala, do not modify */ #include +#include #include #include @@ -15,6 +16,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) typedef void (*FooFunc) (GError** error, const gchar* _first_array, ...); #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -28,6 +30,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void foo (GError** error, gchar* _first_array, ...); @@ -50,6 +53,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAD, "FOO_ERROR_BAD", "bad"}, {FOO_ERROR_WORSE, "FOO_ERROR_WORSE", "worse"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static void _vala_array_add1 (const gchar** * array, gint* length, diff --git a/tests/delegates/variadic.c-expected b/tests/delegates/variadic.c-expected index ae5d477d6..176dd015e 100644 --- a/tests/delegates/variadic.c-expected +++ b/tests/delegates/variadic.c-expected @@ -4,6 +4,7 @@ #include #include #include +#include #include #if !defined(VALA_EXTERN) @@ -18,6 +19,8 @@ typedef void (*FooFunc) (const gchar* first, ...); typedef void (*BarFunc) (const gchar* first, ...); + +#define TYPE_BAZ_ERROR (baz_error_get_type ()) typedef void (*BazFunc) (const gchar* first, GError** error, ...); #define _g_free0(var) (var = (g_free (var), NULL)) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); @@ -32,6 +35,7 @@ typedef enum { #define BAZ_ERROR baz_error_quark () VALA_EXTERN GQuark baz_error_quark (void); +GType baz_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void foo (const gchar* first, ...); VALA_EXTERN void baz (const gchar* first, @@ -49,6 +53,27 @@ baz_error_quark (void) return g_quark_from_static_string ("baz-error-quark"); } +static GType +baz_error_get_type_once (void) +{ + static const GEnumValue values[] = {{BAZ_ERROR_BAD, "BAZ_ERROR_BAD", "bad"}, {BAZ_ERROR_WORSE, "BAZ_ERROR_WORSE", "worse"}, {0, NULL, NULL}}; + GType baz_error_type_id; + baz_error_type_id = g_enum_register_static ("BazError", values); + return baz_error_type_id; +} + +GType +baz_error_get_type (void) +{ + static volatile gsize baz_error_type_id__once = 0; + if (g_once_init_enter (&baz_error_type_id__once)) { + GType baz_error_type_id; + baz_error_type_id = baz_error_get_type_once (); + g_once_init_leave (&baz_error_type_id__once, baz_error_type_id); + } + return baz_error_type_id__once; +} + void foo (const gchar* first, ...) diff --git a/tests/errors/bug567181.c-expected b/tests/errors/bug567181.c-expected index db3a661b0..6d811473f 100644 --- a/tests/errors/bug567181.c-expected +++ b/tests/errors/bug567181.c-expected @@ -23,6 +23,8 @@ typedef struct _Foo Foo; typedef struct _FooClass FooClass; + +#define TYPE_ERROR (error_get_type ()) typedef struct _FooPrivate FooPrivate; enum { FOO_0_PROPERTY, @@ -39,6 +41,7 @@ typedef enum { ERROR_FOOBAR } Error; #define ERROR error_quark () + struct _Foo { GObject parent_instance; FooPrivate * priv; @@ -55,6 +58,7 @@ static gpointer foo_parent_class = NULL; VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref) VALA_EXTERN GQuark error_quark (void); +GType error_get_type (void) G_GNUC_CONST ; VALA_EXTERN Foo* foo_new (GError** error); VALA_EXTERN Foo* foo_construct (GType object_type, GError** error); @@ -69,6 +73,27 @@ error_quark (void) return g_quark_from_static_string ("error-quark"); } +static GType +error_get_type_once (void) +{ + static const GEnumValue values[] = {{ERROR_FOOBAR, "ERROR_FOOBAR", "foobar"}, {0, NULL, NULL}}; + GType error_type_id; + error_type_id = g_enum_register_static ("Error", values); + return error_type_id; +} + +GType +error_get_type (void) +{ + static volatile gsize error_type_id__once = 0; + if (g_once_init_enter (&error_type_id__once)) { + GType error_type_id; + error_type_id = error_get_type_once (); + g_once_init_leave (&error_type_id__once, error_type_id); + } + return error_type_id__once; +} + static gpointer _g_object_ref0 (gpointer self) { diff --git a/tests/errors/bug579101.c-expected b/tests/errors/bug579101.c-expected index a3b312bab..0fac3fdd2 100644 --- a/tests/errors/bug579101.c-expected +++ b/tests/errors/bug579101.c-expected @@ -2,6 +2,7 @@ * generated from errors_bug579101.vala, do not modify */ #include +#include #include #include @@ -15,6 +16,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) #define _g_free0(var) (var = (g_free (var), NULL)) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -27,6 +29,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void do_foo (gint* i); VALA_EXTERN gchar* do_bar (gint* i); VALA_EXTERN gchar* do_manam (gint* i); @@ -38,6 +41,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + void do_foo (gint* i) { diff --git a/tests/errors/bug623049.c-expected b/tests/errors/bug623049.c-expected index 0dc36ff53..403ab58af 100644 --- a/tests/errors/bug623049.c-expected +++ b/tests/errors/bug623049.c-expected @@ -14,6 +14,8 @@ #endif #endif +#define TYPE_FOO (foo_get_type ()) + #define TYPE_CLS_A (cls_a_get_type ()) #define CLS_A(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CLS_A, ClsA)) #define CLS_A_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CLS_A, ClsAClass)) @@ -51,6 +53,7 @@ typedef enum { FOO_BAR } Foo; #define FOO foo_quark () + struct _ClsA { GObject parent_instance; ClsAPrivate * priv; @@ -73,6 +76,7 @@ static gpointer cls_a_parent_class = NULL; static gpointer cls_b_parent_class = NULL; VALA_EXTERN GQuark foo_quark (void); +GType foo_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType cls_a_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (ClsA, g_object_unref) VALA_EXTERN ClsA* cls_a_new (GError** error); @@ -93,6 +97,27 @@ foo_quark (void) return g_quark_from_static_string ("foo-quark"); } +static GType +foo_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_BAR, "FOO_BAR", "bar"}, {0, NULL, NULL}}; + GType foo_type_id; + foo_type_id = g_enum_register_static ("Foo", values); + return foo_type_id; +} + +GType +foo_get_type (void) +{ + static volatile gsize foo_type_id__once = 0; + if (g_once_init_enter (&foo_type_id__once)) { + GType foo_type_id; + foo_type_id = foo_get_type_once (); + g_once_init_leave (&foo_type_id__once, foo_type_id); + } + return foo_type_id__once; +} + ClsA* cls_a_construct (GType object_type, GError** error) diff --git a/tests/errors/bug778224.c-expected b/tests/errors/bug778224.c-expected index b62036448..1ebb8379a 100644 --- a/tests/errors/bug778224.c-expected +++ b/tests/errors/bug778224.c-expected @@ -2,6 +2,7 @@ * generated from errors_bug778224.vala, do not modify */ #include +#include #if !defined(VALA_EXTERN) #if defined(_MSC_VER) @@ -13,12 +14,14 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) typedef struct _Foo Foo; typedef enum { FOO_ERROR_BAR } FooError; #define FOO_ERROR foo_error_quark () + struct _Foo { gint i; }; @@ -27,6 +30,7 @@ VALA_EXTERN gboolean true; gboolean true = TRUE; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN Foo foo (GError** error); static void _vala_main (void); @@ -36,6 +40,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAR, "FOO_ERROR_BAR", "bar"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + Foo foo (GError** error) { diff --git a/tests/errors/catch-error-code.c-expected b/tests/errors/catch-error-code.c-expected index e5132b736..7fcd6f486 100644 --- a/tests/errors/catch-error-code.c-expected +++ b/tests/errors/catch-error-code.c-expected @@ -2,6 +2,7 @@ * generated from errors_catch_error_code.vala, do not modify */ #include +#include #if !defined(VALA_EXTERN) #if defined(_MSC_VER) @@ -13,6 +14,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + typedef enum { FOO_ERROR_BAR, FOO_ERROR_FOO @@ -20,6 +23,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; static void _vala_main (void); GQuark @@ -28,6 +32,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAR, "FOO_ERROR_BAR", "bar"}, {FOO_ERROR_FOO, "FOO_ERROR_FOO", "foo"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static void _vala_main (void) { diff --git a/tests/errors/catch-in-finally.c-expected b/tests/errors/catch-in-finally.c-expected index cecb359e8..fadaeed6d 100644 --- a/tests/errors/catch-in-finally.c-expected +++ b/tests/errors/catch-in-finally.c-expected @@ -2,6 +2,7 @@ * generated from errors_catch_in_finally.vala, do not modify */ #include +#include #include #include @@ -15,6 +16,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -27,6 +29,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void fail (GError** error); VALA_EXTERN void may_fail (GError** error); VALA_EXTERN void foo (GError** error); @@ -39,6 +42,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + void fail (GError** error) { diff --git a/tests/errors/default-gtype.c-expected b/tests/errors/default-gtype.c-expected index a65b92b1f..d38b8aaf2 100644 --- a/tests/errors/default-gtype.c-expected +++ b/tests/errors/default-gtype.c-expected @@ -14,6 +14,7 @@ #endif #endif +#define TYPE_FOO (foo_get_type ()) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -25,6 +26,7 @@ typedef enum { #define FOO foo_quark () VALA_EXTERN GQuark foo_quark (void); +GType foo_get_type (void) G_GNUC_CONST ; static void _vala_main (void); GQuark @@ -33,6 +35,27 @@ foo_quark (void) return g_quark_from_static_string ("foo-quark"); } +static GType +foo_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_MANAM, "FOO_MANAM", "manam"}, {0, NULL, NULL}}; + GType foo_type_id; + foo_type_id = g_enum_register_static ("Foo", values); + return foo_type_id; +} + +GType +foo_get_type (void) +{ + static volatile gsize foo_type_id__once = 0; + if (g_once_init_enter (&foo_type_id__once)) { + GType foo_type_id; + foo_type_id = foo_get_type_once (); + g_once_init_leave (&foo_type_id__once, foo_type_id); + } + return foo_type_id__once; +} + static void _vala_main (void) { diff --git a/tests/errors/delegate-throws-error-code.c-expected b/tests/errors/delegate-throws-error-code.c-expected index 5ccd6e4de..fadfb48f8 100644 --- a/tests/errors/delegate-throws-error-code.c-expected +++ b/tests/errors/delegate-throws-error-code.c-expected @@ -2,6 +2,7 @@ * generated from errors_delegate_throws_error_code.vala, do not modify */ #include +#include #if !defined(VALA_EXTERN) #if defined(_MSC_VER) @@ -13,6 +14,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) typedef void (*FooFunc) (gpointer user_data, GError** error); typedef enum { @@ -22,6 +24,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; static void _vala_main (void); static void __lambda4_ (GError** error); static void ___lambda4__foo_func (gpointer self, @@ -33,6 +36,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FOO, "FOO_ERROR_FOO", "foo"}, {FOO_ERROR_BAR, "FOO_ERROR_BAR", "bar"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static void __lambda4_ (GError** error) { diff --git a/tests/errors/errorcode.c-expected b/tests/errors/errorcode.c-expected index 45c7db847..1e25de2fb 100644 --- a/tests/errors/errorcode.c-expected +++ b/tests/errors/errorcode.c-expected @@ -2,6 +2,7 @@ * generated from errors_errorcode.vala, do not modify */ #include +#include #include #if !defined(VALA_EXTERN) @@ -14,6 +15,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -28,6 +30,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void bar (gint code); static void _vala_main (void); @@ -37,6 +40,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_REALLY_BAD, "FOO_ERROR_REALLY_BAD", "really-bad"}, {FOO_ERROR_NOT_SO_GOOD, "FOO_ERROR_NOT_SO_GOOD", "not-so-good"}, {FOO_ERROR_EVEN_WORSE, "FOO_ERROR_EVEN_WORSE", "even-worse"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + void bar (gint code) { diff --git a/tests/errors/errordomain-static-method.c-expected b/tests/errors/errordomain-static-method.c-expected index f369c2d79..070ee2e7c 100644 --- a/tests/errors/errordomain-static-method.c-expected +++ b/tests/errors/errordomain-static-method.c-expected @@ -2,6 +2,7 @@ * generated from errors_errordomain_static_method.vala, do not modify */ #include +#include #include #include @@ -15,6 +16,7 @@ #endif #endif +#define TYPE_FOO (foo_get_type ()) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } @@ -27,6 +29,7 @@ typedef enum { #define FOO foo_quark () VALA_EXTERN GQuark foo_quark (void); +GType foo_get_type (void) G_GNUC_CONST ; VALA_EXTERN GError* foo_from_string (const gchar* _error_); static void _vala_main (void); @@ -48,6 +51,27 @@ foo_quark (void) return g_quark_from_static_string ("foo-quark"); } +static GType +foo_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_BAD, "FOO_BAD", "bad"}, {0, NULL, NULL}}; + GType foo_type_id; + foo_type_id = g_enum_register_static ("Foo", values); + return foo_type_id; +} + +GType +foo_get_type (void) +{ + static volatile gsize foo_type_id__once = 0; + if (g_once_init_enter (&foo_type_id__once)) { + GType foo_type_id; + foo_type_id = foo_get_type_once (); + g_once_init_leave (&foo_type_id__once, foo_type_id); + } + return foo_type_id__once; +} + static void _vala_main (void) { diff --git a/tests/errors/errordomain.c-expected b/tests/errors/errordomain.c-expected index 3ef447771..51d8a1f06 100644 --- a/tests/errors/errordomain.c-expected +++ b/tests/errors/errordomain.c-expected @@ -2,6 +2,7 @@ * generated from errors_errordomain.vala, do not modify */ #include +#include #if !defined(VALA_EXTERN) #if defined(_MSC_VER) @@ -13,12 +14,15 @@ #endif #endif +#define TYPE_FOO (foo_get_type ()) + typedef enum { FOO_BAD } Foo; #define FOO foo_quark () VALA_EXTERN GQuark foo_quark (void); +GType foo_get_type (void) G_GNUC_CONST ; static void _vala_main (void); GQuark @@ -27,6 +31,27 @@ foo_quark (void) return g_quark_from_static_string ("foo-quark"); } +static GType +foo_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_BAD, "FOO_BAD", "bad"}, {0, NULL, NULL}}; + GType foo_type_id; + foo_type_id = g_enum_register_static ("Foo", values); + return foo_type_id; +} + +GType +foo_get_type (void) +{ + static volatile gsize foo_type_id__once = 0; + if (g_once_init_enter (&foo_type_id__once)) { + GType foo_type_id; + foo_type_id = foo_get_type_once (); + g_once_init_leave (&foo_type_id__once, foo_type_id); + } + return foo_type_id__once; +} + static void _vala_main (void) { diff --git a/tests/errors/errors.c-expected b/tests/errors/errors.c-expected index 6294d88ea..25c46745a 100644 --- a/tests/errors/errors.c-expected +++ b/tests/errors/errors.c-expected @@ -17,6 +17,8 @@ #endif #endif +#define TYPE_BAR_ERROR (bar_error_get_type ()) + #define TYPE_BAR (bar_get_type ()) #define BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_BAR, Bar)) #define BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_BAR, BarClass)) @@ -40,6 +42,7 @@ typedef enum { BAR_ERROR_BAR } BarError; #define BAR_ERROR bar_error_quark () + struct _Bar { GObject parent_instance; BarPrivate * priv; @@ -52,6 +55,7 @@ struct _BarClass { static gpointer bar_parent_class = NULL; VALA_EXTERN GQuark bar_error_quark (void); +GType bar_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType bar_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Bar, g_object_unref) VALA_EXTERN void bar_foo (Bar* self, @@ -76,6 +80,27 @@ bar_error_quark (void) return g_quark_from_static_string ("bar-error-quark"); } +static GType +bar_error_get_type_once (void) +{ + static const GEnumValue values[] = {{BAR_ERROR_FOO, "BAR_ERROR_FOO", "foo"}, {BAR_ERROR_BAR, "BAR_ERROR_BAR", "bar"}, {0, NULL, NULL}}; + GType bar_error_type_id; + bar_error_type_id = g_enum_register_static ("BarError", values); + return bar_error_type_id; +} + +GType +bar_error_get_type (void) +{ + static volatile gsize bar_error_type_id__once = 0; + if (g_once_init_enter (&bar_error_type_id__once)) { + GType bar_error_type_id; + bar_error_type_id = bar_error_get_type_once (); + g_once_init_leave (&bar_error_type_id__once, bar_error_type_id); + } + return bar_error_type_id__once; +} + void bar_foo (Bar* self, GError** error) diff --git a/tests/errors/loops.c-expected b/tests/errors/loops.c-expected index b85da1cf9..e42138013 100644 --- a/tests/errors/loops.c-expected +++ b/tests/errors/loops.c-expected @@ -2,6 +2,7 @@ * generated from errors_loops.vala, do not modify */ #include +#include #include #include @@ -15,6 +16,7 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) #define _g_free0(var) (var = (g_free (var), NULL)) typedef enum { @@ -23,6 +25,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN gchar** get_array (gint* result_length1, GError** error); VALA_EXTERN gboolean get_bool (GError** error); @@ -45,6 +48,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + gchar** get_array (gint* result_length1, GError** error) diff --git a/tests/errors/method-throws-error-code.c-expected b/tests/errors/method-throws-error-code.c-expected index 1fa8f2be4..dceef5dfb 100644 --- a/tests/errors/method-throws-error-code.c-expected +++ b/tests/errors/method-throws-error-code.c-expected @@ -2,6 +2,7 @@ * generated from errors_method_throws_error_code.vala, do not modify */ #include +#include #if !defined(VALA_EXTERN) #if defined(_MSC_VER) @@ -13,6 +14,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + typedef enum { FOO_ERROR_FOO, FOO_ERROR_BAR @@ -20,6 +23,7 @@ typedef enum { #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void foo (GError** error); static void _vala_main (void); @@ -29,6 +33,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FOO, "FOO_ERROR_FOO", "foo"}, {FOO_ERROR_BAR, "FOO_ERROR_BAR", "bar"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + void foo (GError** error) { diff --git a/tests/errors/unhandled.c-expected b/tests/errors/unhandled.c-expected index 6de43da7c..deb2f7f3f 100644 --- a/tests/errors/unhandled.c-expected +++ b/tests/errors/unhandled.c-expected @@ -16,6 +16,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_FOO (foo_get_type ()) #define FOO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FOO, Foo)) #define FOO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FOO, FooClass)) @@ -37,6 +39,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _Foo { GObject parent_instance; FooPrivate * priv; @@ -49,6 +52,7 @@ struct _FooClass { static gpointer foo_parent_class = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType foo_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Foo, g_object_unref) VALA_EXTERN Foo* foo_new (void); @@ -80,6 +84,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + Foo* foo_construct (GType object_type) { diff --git a/tests/genie/exception.c-expected b/tests/genie/exception.c-expected index 976e2c579..d75111d7f 100644 --- a/tests/genie/exception.c-expected +++ b/tests/genie/exception.c-expected @@ -4,6 +4,7 @@ #include #include #include +#include #if !defined(VALA_EXTERN) #if defined(_MSC_VER) @@ -15,6 +16,7 @@ #endif #endif +#define TYPE_TEST_ERROR (test_error_get_type ()) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef enum { @@ -27,6 +29,7 @@ typedef enum { static void _vala_main (gchar** args, gint args_length1); VALA_EXTERN GQuark test_error_quark (void); +GType test_error_get_type (void) G_GNUC_CONST ; static void _vala_main (gchar** args, @@ -53,3 +56,24 @@ test_error_quark (void) return g_quark_from_static_string ("test-error-quark"); } +static GType +test_error_get_type_once (void) +{ + static const GEnumValue values[] = {{TEST_ERROR_FAIL, "TEST_ERROR_FAIL", "fail"}, {TEST_ERROR_BAD, "TEST_ERROR_BAD", "bad"}, {TEST_ERROR_WORSE, "TEST_ERROR_WORSE", "worse"}, {0, NULL, NULL}}; + GType test_error_type_id; + test_error_type_id = g_enum_register_static ("TestError", values); + return test_error_type_id; +} + +GType +test_error_get_type (void) +{ + static volatile gsize test_error_type_id__once = 0; + if (g_once_init_enter (&test_error_type_id__once)) { + GType test_error_type_id; + test_error_type_id = test_error_get_type_once (); + g_once_init_leave (&test_error_type_id__once, test_error_type_id); + } + return test_error_type_id__once; +} + diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected index 72b408d5a..c308e62a1 100644 --- a/tests/girwriter/GirTest-1.0.gir-expected +++ b/tests/girwriter/GirTest-1.0.gir-expected @@ -37,12 +37,17 @@ - + - + + + + + + diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala index 82d146ecc..b2b107385 100644 --- a/tests/girwriter/girtest.vala +++ b/tests/girwriter/girtest.vala @@ -111,6 +111,13 @@ namespace GirTest { FISHY = 23 } + [CCode (has_type_id = false)] + public errordomain PlainErrorTest { + FAILED, + SMELLY, + FISHY = 23 + } + [GIR (name = "RenamedError")] public errordomain NamedError { FAILED diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected index 0350bd8e6..578d588dc 100644 --- a/tests/girwriter/girtest.vapi-expected +++ b/tests/girwriter/girtest.vapi-expected @@ -249,6 +249,12 @@ namespace GirTest { public errordomain NamedError { FAILED } + [CCode (cheader_filename = "girtest.h", has_type_id = false)] + public errordomain PlainErrorTest { + FAILED, + SMELLY, + FISHY + } [CCode (cheader_filename = "girtest.h")] public delegate bool DelegateErrorTest () throws GirTest.ErrorTest; [CCode (cheader_filename = "girtest.h")] diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected index ad33e3c96..d559fbea0 100644 --- a/tests/girwriter/girtest.vapigen-expected +++ b/tests/girwriter/girtest.vapigen-expected @@ -251,13 +251,19 @@ namespace GirTest { public enum RenamedEnumeration { VALUE1 } - [CCode (cheader_filename = "girtest.h", cprefix = "GIR_TEST_ERROR_TEST_")] + [CCode (cheader_filename = "girtest.h", cprefix = "GIR_TEST_ERROR_TEST_", type_id = "gir_test_error_test_get_type ()")] public errordomain ErrorTest { FAILED, SMELLY, FISHY } - [CCode (cheader_filename = "girtest.h", cname = "GirTestNamedError", cprefix = "GIR_TEST_NAMED_ERROR_")] + [CCode (cheader_filename = "girtest.h", cprefix = "GIR_TEST_PLAIN_ERROR_TEST_", has_type_id = false)] + public errordomain PlainErrorTest { + FAILED, + SMELLY, + FISHY + } + [CCode (cheader_filename = "girtest.h", cname = "GirTestNamedError", cprefix = "GIR_TEST_NAMED_ERROR_", type_id = "gir_test_named_error_get_type ()")] public errordomain RenamedError { FAILED } diff --git a/tests/methods/bug781061.c-expected b/tests/methods/bug781061.c-expected index 91d787d5e..352fa1e2f 100644 --- a/tests/methods/bug781061.c-expected +++ b/tests/methods/bug781061.c-expected @@ -2,6 +2,7 @@ * generated from methods_bug781061.vala, do not modify */ #include +#include #include #include #include @@ -16,12 +17,15 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + typedef enum { FOO_ERROR_FAILED } FooError; #define FOO_ERROR foo_error_quark () VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void print_something_throws (gboolean ok, const gchar* format, GError** error, @@ -46,6 +50,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAILED, "FOO_ERROR_FAILED", "failed"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + void print_something_throws (gboolean ok, const gchar* format, diff --git a/tests/methods/parameter-out-free-on-error.c-expected b/tests/methods/parameter-out-free-on-error.c-expected index db888bd11..18e4fcc18 100644 --- a/tests/methods/parameter-out-free-on-error.c-expected +++ b/tests/methods/parameter-out-free-on-error.c-expected @@ -14,6 +14,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_MANAM (manam_get_type ()) #define MANAM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MANAM, Manam)) #define MANAM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MANAM, ManamClass)) @@ -39,6 +41,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _Manam { GObject parent_instance; ManamPrivate * priv; @@ -51,6 +54,7 @@ struct _ManamClass { static gpointer manam_parent_class = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType manam_get_type (void) G_GNUC_CONST ; G_DEFINE_AUTOPTR_CLEANUP_FUNC (Manam, g_object_unref) VALA_EXTERN Manam* manam_new (void); @@ -70,6 +74,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + Manam* manam_construct (GType object_type) { diff --git a/tests/methods/params-array-with-throws.c-expected b/tests/methods/params-array-with-throws.c-expected index a456b3329..0d25797cc 100644 --- a/tests/methods/params-array-with-throws.c-expected +++ b/tests/methods/params-array-with-throws.c-expected @@ -2,9 +2,9 @@ * generated from methods_params_array_with_throws.vala, do not modify */ #include +#include #include #include -#include #include #if !defined(VALA_EXTERN) @@ -17,6 +17,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_FOO (foo_get_type ()) #define FOO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FOO, Foo)) #define FOO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FOO, FooClass)) @@ -39,6 +41,7 @@ typedef enum { FOO_ERROR_WORSE } FooError; #define FOO_ERROR foo_error_quark () + struct _Foo { GTypeInstance parent_instance; volatile int ref_count; @@ -57,6 +60,7 @@ struct _ParamSpecFoo { static gpointer foo_parent_class = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN void foo (GError** error, const gchar* _first_array, ...); @@ -113,6 +117,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAD, "FOO_ERROR_BAD", "bad"}, {FOO_ERROR_WORSE, "FOO_ERROR_WORSE", "worse"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + static void _vala_array_add1 (const gchar** * array, gint* length, diff --git a/tests/methods/print-attribute.c-expected b/tests/methods/print-attribute.c-expected index bd627c809..d3b9ae59e 100644 --- a/tests/methods/print-attribute.c-expected +++ b/tests/methods/print-attribute.c-expected @@ -17,6 +17,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_FOO (foo_get_type ()) #define FOO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FOO, Foo)) #define FOO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_FOO, FooClass)) @@ -39,6 +41,7 @@ typedef enum { FOO_ERROR_FAIL } FooError; #define FOO_ERROR foo_error_quark () + struct _Foo { GTypeInstance parent_instance; volatile int ref_count; @@ -57,6 +60,7 @@ struct _ParamSpecFoo { static gpointer foo_parent_class = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN gpointer foo_ref (gpointer instance); VALA_EXTERN void foo_unref (gpointer instance); VALA_EXTERN GParamSpec* param_spec_foo (const gchar* name, @@ -88,6 +92,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_FAIL, "FOO_ERROR_FAIL", "fail"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + void foo_foo (Foo* self, const gchar* s) diff --git a/tests/objects/signals-error-marshal.c-expected b/tests/objects/signals-error-marshal.c-expected index 35e69052c..110f63cf4 100644 --- a/tests/objects/signals-error-marshal.c-expected +++ b/tests/objects/signals-error-marshal.c-expected @@ -15,6 +15,8 @@ #endif #endif +#define TYPE_FOO_ERROR (foo_error_get_type ()) + #define TYPE_BAR (bar_get_type ()) typedef struct _Bar Bar; @@ -50,6 +52,7 @@ typedef enum { FOO_ERROR_BAD } FooError; #define FOO_ERROR foo_error_quark () + struct _Bar { gint i; }; @@ -66,6 +69,7 @@ struct _FooClass { static gpointer foo_parent_class = NULL; VALA_EXTERN GQuark foo_error_quark (void); +GType foo_error_get_type (void) G_GNUC_CONST ; VALA_EXTERN GType bar_get_type (void) G_GNUC_CONST ; VALA_EXTERN Bar* bar_dup (const Bar* self); VALA_EXTERN void bar_free (Bar* self); @@ -101,6 +105,27 @@ foo_error_quark (void) return g_quark_from_static_string ("foo-error-quark"); } +static GType +foo_error_get_type_once (void) +{ + static const GEnumValue values[] = {{FOO_ERROR_BAD, "FOO_ERROR_BAD", "bad"}, {0, NULL, NULL}}; + GType foo_error_type_id; + foo_error_type_id = g_enum_register_static ("FooError", values); + return foo_error_type_id; +} + +GType +foo_error_get_type (void) +{ + static volatile gsize foo_error_type_id__once = 0; + if (g_once_init_enter (&foo_error_type_id__once)) { + GType foo_error_type_id; + foo_error_type_id = foo_error_get_type_once (); + g_once_init_leave (&foo_error_type_id__once, foo_error_type_id); + } + return foo_error_type_id__once; +} + Bar* bar_dup (const Bar* self) { diff --git a/vala/valaerrorcode.vala b/vala/valaerrorcode.vala index 525fb7d55..5fcff7585 100644 --- a/vala/valaerrorcode.vala +++ b/vala/valaerrorcode.vala @@ -54,8 +54,24 @@ public class Vala.ErrorCode : TypeSymbol { } } + /** + * The nick of this error code + */ + public string nick { + get { + if (_nick == null) { + _nick = get_attribute_string ("Description", "nick"); + if (_nick == null) { + _nick = name.down ().replace ("_", "-"); + } + } + return _nick; + } + } + private Expression _value; private Constant _code; + private string? _nick = null; /** * Creates a new enum value. -- GitLab From 147cf8ace00c314dcf5e9bff62e02f68746b5664 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 18 Nov 2018 21:38:09 +0100 Subject: [PATCH 5/6] girparser: Pick up type_id of error domains --- tests/gir/errordomain.test | 4 ++-- vala/valagirparser.vala | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/gir/errordomain.test b/tests/gir/errordomain.test index 4ff318c79..bf37f46ef 100644 --- a/tests/gir/errordomain.test +++ b/tests/gir/errordomain.test @@ -33,12 +33,12 @@ Input: Output: -[CCode (cheader_filename = "test.h", cname = "TestError", cprefix = "TEST_ERROR_")] +[CCode (cheader_filename = "test.h", cname = "TestError", cprefix = "TEST_ERROR_", has_type_id = false)] public errordomain TestError { BAR, FOO } -[CCode (cheader_filename = "test.h", cname = "TestErrorWithType", cprefix = "TEST_ERROR_WITH_TYPE_")] +[CCode (cheader_filename = "test.h", cname = "TestErrorWithType", cprefix = "TEST_ERROR_WITH_TYPE_", type_id = "test_error_with_type_get_type ()")] public errordomain TestErrorWithType { BAR, FOO diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala index 3babf7424..6b3d69357 100644 --- a/vala/valagirparser.vala +++ b/vala/valagirparser.vala @@ -2451,8 +2451,7 @@ public class Vala.GirParser : CodeVisitor { sym = current.symbol; } - if (!error_domain) - set_type_id_ccode (sym); + set_type_id_ccode (sym); sym.access = SymbolAccessibility.PUBLIC; -- GitLab From d5a1678cad4013f0d5b285eb1dd9125f3c7f3471 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 18 Nov 2018 21:46:30 +0100 Subject: [PATCH 6/6] vapi: Regenerate GIR-based bindings to pick up type_id of error domains --- vapi/clutter-1.0.vapi | 8 ++++---- vapi/clutter-gtk-1.0.vapi | 2 +- vapi/gdk-3.0.vapi | 2 +- vapi/gdk-pixbuf-2.0.vapi | 2 +- vapi/geocode-glib-1.0.vapi | 2 +- vapi/gio-2.0.vapi | 12 ++++++------ vapi/gmodule-2.0.vapi | 2 +- vapi/gnome-desktop-3.0.vapi | 2 +- vapi/gnome-rr-4.vapi | 2 +- vapi/gobject-introspection-1.0.vapi | 4 ++-- vapi/gstreamer-1.0.vapi | 14 +++++++------- vapi/gstreamer-play-1.0.vapi | 2 +- vapi/gstreamer-player-1.0.vapi | 2 +- vapi/gstreamer-webrtc-1.0.vapi | 2 +- vapi/gtk+-3.0.vapi | 14 +++++++------- vapi/gtk4.vapi | 22 +++++++++++----------- vapi/json-glib-1.0.vapi | 6 +++--- vapi/libgsf-1.vapi | 2 +- vapi/libpeas-1.0.vapi | 2 +- vapi/libsoup-2.4.vapi | 10 +++++----- vapi/libsoup-3.0.vapi | 6 +++--- vapi/packagekit-glib2.vapi | 6 +++--- vapi/pango.vapi | 2 +- vapi/polkit-gobject-1.vapi | 2 +- vapi/poppler-glib.vapi | 2 +- vapi/rest-0.7.vapi | 4 ++-- vapi/udisks2.vapi | 2 +- vapi/webkit2gtk-4.0.vapi | 20 ++++++++++---------- vapi/webkit2gtk-5.0.vapi | 20 ++++++++++---------- 29 files changed, 89 insertions(+), 89 deletions(-) diff --git a/vapi/clutter-1.0.vapi b/vapi/clutter-1.0.vapi index c49ee3696..718350e3a 100644 --- a/vapi/clutter-1.0.vapi +++ b/vapi/clutter-1.0.vapi @@ -8965,13 +8965,13 @@ namespace Clutter { Y_AXIS, BOTH } - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_IMAGE_ERROR_INVALID_")] + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_IMAGE_ERROR_INVALID_", type_id = "clutter_image_error_get_type ()")] [Version (since = "1.10")] public errordomain ImageError { DATA; public static GLib.Quark quark (); } - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_")] + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SCRIPT_ERROR_INVALID_", type_id = "clutter_script_error_get_type ()")] [Version (since = "0.6")] public errordomain ScriptError { TYPE_FUNCTION, @@ -8979,7 +8979,7 @@ namespace Clutter { VALUE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SHADER_ERROR_")] + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_SHADER_ERROR_", type_id = "clutter_shader_error_get_type ()")] [Version (deprecated = true, deprecated_since = "1.8", since = "0.6")] public errordomain ShaderError { NO_ASM, @@ -8987,7 +8987,7 @@ namespace Clutter { COMPILE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_ERROR_")] + [CCode (cheader_filename = "clutter/clutter.h", cprefix = "CLUTTER_TEXTURE_ERROR_", type_id = "clutter_texture_error_get_type ()")] [Version (since = "0.4")] public errordomain TextureError { OUT_OF_MEMORY, diff --git a/vapi/clutter-gtk-1.0.vapi b/vapi/clutter-gtk-1.0.vapi index b7abe99c9..f3e2d30c4 100644 --- a/vapi/clutter-gtk-1.0.vapi +++ b/vapi/clutter-gtk-1.0.vapi @@ -41,7 +41,7 @@ namespace GtkClutter { public Window (); public unowned Clutter.Actor get_stage (); } - [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_")] + [CCode (cheader_filename = "clutter-gtk/clutter-gtk.h", cprefix = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_", has_type_id = false)] [Version (since = "1.0")] public errordomain TextureError { [CCode (cname = "GTK_CLUTTER_TEXTURE_ERROR_INVALID_STOCK_ID")] diff --git a/vapi/gdk-3.0.vapi b/vapi/gdk-3.0.vapi index 9acb2df88..ba58f0a6d 100644 --- a/vapi/gdk-3.0.vapi +++ b/vapi/gdk-3.0.vapi @@ -6623,7 +6623,7 @@ namespace Gdk { [CCode (cname = "GDK_INPUT_ONLY")] INPUT_ONLY } - [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GL_ERROR_")] + [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GL_ERROR_", type_id = "gdk_gl_error_get_type ()")] [Version (since = "3.16")] public errordomain GLError { NOT_AVAILABLE, diff --git a/vapi/gdk-pixbuf-2.0.vapi b/vapi/gdk-pixbuf-2.0.vapi index 79d0c4888..3aba4cf56 100644 --- a/vapi/gdk-pixbuf-2.0.vapi +++ b/vapi/gdk-pixbuf-2.0.vapi @@ -349,7 +349,7 @@ namespace Gdk { ENCODING_RLE, ENCODING_MASK } - [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_PIXBUF_ERROR_")] + [CCode (cheader_filename = "gdk-pixbuf/gdk-pixbuf.h", cprefix = "GDK_PIXBUF_ERROR_", type_id = "gdk_pixbuf_error_get_type ()")] public errordomain PixbufError { CORRUPT_IMAGE, INSUFFICIENT_MEMORY, diff --git a/vapi/geocode-glib-1.0.vapi b/vapi/geocode-glib-1.0.vapi index 285270e47..be47bc2aa 100644 --- a/vapi/geocode-glib-1.0.vapi +++ b/vapi/geocode-glib-1.0.vapi @@ -255,7 +255,7 @@ namespace Geocode { BAR, LIGHT_RAIL_STATION } - [CCode (cheader_filename = "geocode-glib/geocode-glib.h", cprefix = "GEOCODE_ERROR_")] + [CCode (cheader_filename = "geocode-glib/geocode-glib.h", cprefix = "GEOCODE_ERROR_", type_id = "geocode_error_get_type ()")] public errordomain Error { PARSE, NOT_SUPPORTED, diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index db0a3f956..dc565db94 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -4901,7 +4901,7 @@ namespace GLib { GZIP, RAW } - [CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_ERROR_")] + [CCode (cheader_filename = "gio/gio.h", cprefix = "G_DBUS_ERROR_", type_id = "g_dbus_error_get_type ()")] [Version (since = "2.26")] public errordomain DBusError { FAILED, @@ -4963,7 +4963,7 @@ namespace GLib { public static bool strip_remote_error (GLib.Error error); public static bool unregister_error (GLib.Quark error_domain, int error_code, string dbus_error_name); } - [CCode (cheader_filename = "gio/gio.h", cname = "GIOErrorEnum", cprefix = "G_IO_ERROR_")] + [CCode (cheader_filename = "gio/gio.h", cname = "GIOErrorEnum", cprefix = "G_IO_ERROR_", type_id = "g_io_error_enum_get_type ()")] [GIR (name = "IOErrorEnum")] public errordomain IOError { FAILED, @@ -5029,7 +5029,7 @@ namespace GLib { [CCode (cheader_filename = "gio/gio.h")] public static GLib.Quark quark (); } - [CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOLVER_ERROR_")] + [CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOLVER_ERROR_", type_id = "g_resolver_error_get_type ()")] [Version (since = "2.22")] public errordomain ResolverError { NOT_FOUND, @@ -5037,14 +5037,14 @@ namespace GLib { INTERNAL; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOURCE_ERROR_")] + [CCode (cheader_filename = "gio/gio.h", cprefix = "G_RESOURCE_ERROR_", type_id = "g_resource_error_get_type ()")] [Version (since = "2.32")] public errordomain ResourceError { NOT_FOUND, INTERNAL; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_CHANNEL_BINDING_ERROR_")] + [CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_CHANNEL_BINDING_ERROR_", type_id = "g_tls_channel_binding_error_get_type ()")] [Version (since = "2.66")] public errordomain TlsChannelBindingError { NOT_IMPLEMENTED, @@ -5054,7 +5054,7 @@ namespace GLib { GENERAL_ERROR; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_ERROR_")] + [CCode (cheader_filename = "gio/gio.h", cprefix = "G_TLS_ERROR_", type_id = "g_tls_error_get_type ()")] [Version (since = "2.28")] public errordomain TlsError { UNAVAILABLE, diff --git a/vapi/gmodule-2.0.vapi b/vapi/gmodule-2.0.vapi index 6149fb3f0..2a4b33d61 100644 --- a/vapi/gmodule-2.0.vapi +++ b/vapi/gmodule-2.0.vapi @@ -32,7 +32,7 @@ namespace GLib { LOCAL, MASK } - [CCode (cheader_filename = "gmodule.h", cprefix = "G_MODULE_ERROR_")] + [CCode (cheader_filename = "gmodule.h", cprefix = "G_MODULE_ERROR_", has_type_id = false)] [Version (since = "2.70")] public errordomain ModuleError { FAILED, diff --git a/vapi/gnome-desktop-3.0.vapi b/vapi/gnome-desktop-3.0.vapi index cae6f8202..24d80a8a7 100644 --- a/vapi/gnome-desktop-3.0.vapi +++ b/vapi/gnome-desktop-3.0.vapi @@ -356,7 +356,7 @@ namespace Gnome { REFLECT_X, REFLECT_Y } - [CCode (cheader_filename = "libgnome-desktop/gnome-rr.h", cprefix = "GNOME_RR_ERROR_")] + [CCode (cheader_filename = "libgnome-desktop/gnome-rr.h", cprefix = "GNOME_RR_ERROR_", has_type_id = false)] public errordomain RRError { UNKNOWN, NO_RANDR_EXTENSION, diff --git a/vapi/gnome-rr-4.vapi b/vapi/gnome-rr-4.vapi index 7cf4cf68b..b243a9474 100644 --- a/vapi/gnome-rr-4.vapi +++ b/vapi/gnome-rr-4.vapi @@ -163,7 +163,7 @@ namespace GnomeRR { REFLECT_X, REFLECT_Y } - [CCode (cheader_filename = "libgnome-desktop/gnome-rr.h", cprefix = "GNOME_RR_ERROR_")] + [CCode (cheader_filename = "libgnome-desktop/gnome-rr.h", cprefix = "GNOME_RR_ERROR_", has_type_id = false)] public errordomain Error { UNKNOWN, NO_RANDR_EXTENSION, diff --git a/vapi/gobject-introspection-1.0.vapi b/vapi/gobject-introspection-1.0.vapi index 2b8b627ed..306392f92 100644 --- a/vapi/gobject-introspection-1.0.vapi +++ b/vapi/gobject-introspection-1.0.vapi @@ -426,7 +426,7 @@ namespace GI { MUST_NOT_OVERRIDE, THROWS } - [CCode (cheader_filename = "girepository.h", cname = "GInvokeError", cprefix = "G_INVOKE_ERROR_")] + [CCode (cheader_filename = "girepository.h", cname = "GInvokeError", cprefix = "G_INVOKE_ERROR_", has_type_id = false)] [GIR (name = "nvokeError")] public errordomain InvokeError { FAILED, @@ -434,7 +434,7 @@ namespace GI { ARGUMENT_MISMATCH; public static GLib.Quark quark (); } - [CCode (cheader_filename = "girepository.h", cprefix = "G_IREPOSITORY_ERROR_")] + [CCode (cheader_filename = "girepository.h", cprefix = "G_IREPOSITORY_ERROR_", has_type_id = false)] public errordomain RepositoryError { TYPELIB_NOT_FOUND, NAMESPACE_MISMATCH, diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index 50e02fa45..56cf527c1 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -3964,7 +3964,7 @@ namespace Gst { SINK, SRC } - [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CORE_ERROR_")] + [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_CORE_ERROR_", type_id = "gst_core_error_get_type ()")] public errordomain CoreError { FAILED, TOO_LAZY, @@ -3983,7 +3983,7 @@ namespace Gst { NUM_ERRORS; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_LIBRARY_ERROR_")] + [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_LIBRARY_ERROR_", type_id = "gst_library_error_get_type ()")] public errordomain LibraryError { FAILED, TOO_LAZY, @@ -3994,7 +3994,7 @@ namespace Gst { NUM_ERRORS; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PARSE_ERROR_")] + [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PARSE_ERROR_", type_id = "gst_parse_error_get_type ()")] public errordomain ParseError { SYNTAX, NO_SUCH_ELEMENT, @@ -4006,14 +4006,14 @@ namespace Gst { DELAYED_LINK; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PLUGIN_ERROR_")] + [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PLUGIN_ERROR_", type_id = "gst_plugin_error_get_type ()")] public errordomain PluginError { MODULE, DEPENDENCIES, NAME_MISMATCH; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_RESOURCE_ERROR_")] + [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_RESOURCE_ERROR_", type_id = "gst_resource_error_get_type ()")] public errordomain ResourceError { FAILED, TOO_LAZY, @@ -4033,7 +4033,7 @@ namespace Gst { NUM_ERRORS; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STREAM_ERROR_")] + [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_STREAM_ERROR_", type_id = "gst_stream_error_get_type ()")] public errordomain StreamError { FAILED, TOO_LAZY, @@ -4051,7 +4051,7 @@ namespace Gst { NUM_ERRORS; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_URI_ERROR_")] + [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_URI_ERROR_", type_id = "gst_uri_error_get_type ()")] public errordomain URIError { UNSUPPORTED_PROTOCOL, BAD_URI, diff --git a/vapi/gstreamer-play-1.0.vapi b/vapi/gstreamer-play-1.0.vapi index a5018ee30..092514f6a 100644 --- a/vapi/gstreamer-play-1.0.vapi +++ b/vapi/gstreamer-play-1.0.vapi @@ -277,7 +277,7 @@ namespace Gst { PLAYING; public unowned string get_name (); } - [CCode (cheader_filename = "gst/play/play.h", cprefix = "GST_PLAY_ERROR_")] + [CCode (cheader_filename = "gst/play/play.h", cprefix = "GST_PLAY_ERROR_", type_id = "gst_play_error_get_type ()")] [GIR (name = "PlayError")] [Version (since = "1.20")] public errordomain Error { diff --git a/vapi/gstreamer-player-1.0.vapi b/vapi/gstreamer-player-1.0.vapi index 7a0deffaf..4eb3b9526 100644 --- a/vapi/gstreamer-player-1.0.vapi +++ b/vapi/gstreamer-player-1.0.vapi @@ -244,7 +244,7 @@ namespace Gst { PLAYING; public unowned string get_name (); } - [CCode (cheader_filename = "gst/player/player.h", cprefix = "GST_PLAYER_ERROR_")] + [CCode (cheader_filename = "gst/player/player.h", cprefix = "GST_PLAYER_ERROR_", type_id = "gst_player_error_get_type ()")] public errordomain PlayerError { FAILED; public unowned string get_name (); diff --git a/vapi/gstreamer-webrtc-1.0.vapi b/vapi/gstreamer-webrtc-1.0.vapi index 1824be00c..3fc2c5332 100644 --- a/vapi/gstreamer-webrtc-1.0.vapi +++ b/vapi/gstreamer-webrtc-1.0.vapi @@ -288,7 +288,7 @@ namespace Gst { REMOTE_CANDIDATE, CERTIFICATE } - [CCode (cheader_filename = "gst/webrtc/webrtc.h", cprefix = "GST_WEBRTC_ERROR_")] + [CCode (cheader_filename = "gst/webrtc/webrtc.h", cprefix = "GST_WEBRTC_ERROR_", type_id = "gst_webrtc_error_get_type ()")] [Version (since = "1.20")] public errordomain WebRTCError { DATA_CHANNEL_FAILURE, diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi index 732af1878..27cb7574d 100644 --- a/vapi/gtk+-3.0.vapi +++ b/vapi/gtk+-3.0.vapi @@ -12222,7 +12222,7 @@ namespace Gtk { WORD, WORD_CHAR } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUILDER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUILDER_ERROR_", type_id = "gtk_builder_error_get_type ()")] public errordomain BuilderError { INVALID_TYPE_FUNCTION, UNHANDLED_TAG, @@ -12240,7 +12240,7 @@ namespace Gtk { INVALID_ID; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PROVIDER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PROVIDER_ERROR_", type_id = "gtk_css_provider_error_get_type ()")] public errordomain CssProviderError { FAILED, SYNTAX, @@ -12250,7 +12250,7 @@ namespace Gtk { UNKNOWN_VALUE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_", type_id = "gtk_file_chooser_error_get_type ()")] public errordomain FileChooserError { NONEXISTENT, BAD_FILENAME, @@ -12259,13 +12259,13 @@ namespace Gtk { [Version (since = "2.4")] public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_", type_id = "gtk_icon_theme_error_get_type ()")] public errordomain IconThemeError { NOT_FOUND, FAILED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_", type_id = "gtk_print_error_get_type ()")] public errordomain PrintError { GENERAL, INTERNAL_ERROR, @@ -12274,14 +12274,14 @@ namespace Gtk { [Version (since = "2.10")] public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_CHOOSER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_CHOOSER_ERROR_", type_id = "gtk_recent_chooser_error_get_type ()")] [Version (since = "2.10")] public errordomain RecentChooserError { NOT_FOUND, INVALID_URI; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_", type_id = "gtk_recent_manager_error_get_type ()")] [Version (since = "2.10")] public errordomain RecentManagerError { NOT_FOUND, diff --git a/vapi/gtk4.vapi b/vapi/gtk4.vapi index ac1a82b33..0bb9477eb 100644 --- a/vapi/gtk4.vapi +++ b/vapi/gtk4.vapi @@ -5925,7 +5925,7 @@ namespace Gdk { END, CANCEL } - [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GL_ERROR_")] + [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_GL_ERROR_", type_id = "gdk_gl_error_get_type ()")] public errordomain GLError { NOT_AVAILABLE, UNSUPPORTED_FORMAT, @@ -5934,7 +5934,7 @@ namespace Gdk { LINK_FAILED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_TEXTURE_ERROR_")] + [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_TEXTURE_ERROR_", type_id = "gdk_texture_error_get_type ()")] [Version (since = "4.6")] public errordomain TextureError { TOO_LARGE, @@ -5943,7 +5943,7 @@ namespace Gdk { UNSUPPORTED_FORMAT; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VULKAN_ERROR_")] + [CCode (cheader_filename = "gdk/gdk.h", cprefix = "GDK_VULKAN_ERROR_", type_id = "gdk_vulkan_error_get_type ()")] public errordomain VulkanError { UNSUPPORTED, NOT_AVAILABLE; @@ -6502,7 +6502,7 @@ namespace Gsk { @2D_TRANSLATE, IDENTITY } - [CCode (cheader_filename = "gsk/gsk.h", cprefix = "GSK_SERIALIZATION_")] + [CCode (cheader_filename = "gsk/gsk.h", cprefix = "GSK_SERIALIZATION_", type_id = "gsk_serialization_error_get_type ()")] public errordomain SerializationError { UNSUPPORTED_FORMAT, UNSUPPORTED_VERSION, @@ -14166,7 +14166,7 @@ namespace Gtk { WORD, WORD_CHAR } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUILDER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_BUILDER_ERROR_", type_id = "gtk_builder_error_get_type ()")] public errordomain BuilderError { INVALID_TYPE_FUNCTION, UNHANDLED_TAG, @@ -14185,7 +14185,7 @@ namespace Gtk { INVALID_FUNCTION; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_", type_id = "gtk_constraint_vfl_parser_error_get_type ()")] public errordomain ConstraintVflParserError { SYMBOL, ATTRIBUTE, @@ -14195,7 +14195,7 @@ namespace Gtk { RELATION; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PARSER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_CSS_PARSER_ERROR_", has_type_id = false)] public errordomain CssParserError { FAILED, SYNTAX, @@ -14205,7 +14205,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_FILE_CHOOSER_ERROR_", type_id = "gtk_file_chooser_error_get_type ()")] public errordomain FileChooserError { NONEXISTENT, BAD_FILENAME, @@ -14213,13 +14213,13 @@ namespace Gtk { INCOMPLETE_HOSTNAME; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_ICON_THEME_", type_id = "gtk_icon_theme_error_get_type ()")] public errordomain IconThemeError { NOT_FOUND, FAILED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_PRINT_ERROR_", type_id = "gtk_print_error_get_type ()")] public errordomain PrintError { GENERAL, INTERNAL_ERROR, @@ -14227,7 +14227,7 @@ namespace Gtk { INVALID_FILE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_")] + [CCode (cheader_filename = "gtk/gtk.h", cprefix = "GTK_RECENT_MANAGER_ERROR_", type_id = "gtk_recent_manager_error_get_type ()")] public errordomain RecentManagerError { NOT_FOUND, INVALID_URI, diff --git a/vapi/json-glib-1.0.vapi b/vapi/json-glib-1.0.vapi index b4515b890..c4fe65a73 100644 --- a/vapi/json-glib-1.0.vapi +++ b/vapi/json-glib-1.0.vapi @@ -352,7 +352,7 @@ namespace Json { VALUE, NULL } - [CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PARSER_ERROR_")] + [CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PARSER_ERROR_", type_id = "json_parser_error_get_type ()")] public errordomain ParserError { PARSE, TRAILING_COMMA, @@ -364,13 +364,13 @@ namespace Json { UNKNOWN; public static GLib.Quark quark (); } - [CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PATH_ERROR_INVALID_")] + [CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_PATH_ERROR_INVALID_", type_id = "json_path_error_get_type ()")] [Version (since = "0.14")] public errordomain PathError { QUERY; public static GLib.Quark quark (); } - [CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_READER_ERROR_")] + [CCode (cheader_filename = "json-glib/json-glib.h", cprefix = "JSON_READER_ERROR_", type_id = "json_reader_error_get_type ()")] [Version (since = "0.12")] public errordomain ReaderError { NO_ARRAY, diff --git a/vapi/libgsf-1.vapi b/vapi/libgsf-1.vapi index 0d418b07e..b199849fd 100644 --- a/vapi/libgsf-1.vapi +++ b/vapi/libgsf-1.vapi @@ -617,7 +617,7 @@ namespace Gsf { DEFLATED_BETTER, IMPLODED_BETTER } - [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_ERROR_")] + [CCode (cheader_filename = "gsf/gsf.h", cprefix = "GSF_ERROR_", has_type_id = false)] public errordomain Error { OUT_OF_MEMORY, INVALID_DATA; diff --git a/vapi/libpeas-1.0.vapi b/vapi/libpeas-1.0.vapi index 75c5731de..6d2835695 100644 --- a/vapi/libpeas-1.0.vapi +++ b/vapi/libpeas-1.0.vapi @@ -128,7 +128,7 @@ namespace Peas { [NoAccessorMethod] public abstract GLib.Object object { owned get; construct; } } - [CCode (cheader_filename = "libpeas/peas.h", cprefix = "PEAS_PLUGIN_INFO_ERROR_")] + [CCode (cheader_filename = "libpeas/peas.h", cprefix = "PEAS_PLUGIN_INFO_ERROR_", has_type_id = false)] public errordomain PluginInfoError { LOADING_FAILED, LOADER_NOT_FOUND, diff --git a/vapi/libsoup-2.4.vapi b/vapi/libsoup-2.4.vapi index 907e51d99..7b8d0563f 100644 --- a/vapi/libsoup-2.4.vapi +++ b/vapi/libsoup-2.4.vapi @@ -27,14 +27,14 @@ namespace Soup { public static Soup.Message request_new_from_multipart (string uri, Soup.Multipart multipart); } namespace XMLRPC { - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_ERROR_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_ERROR_", type_id = "soup_xmlrpc_error_get_type ()")] [GIR (name = "XMLRPCError")] public errordomain Error { ARGUMENTS, RETVAL; public static GLib.Quark quark (); } - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_FAULT_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_XMLRPC_FAULT_", type_id = "soup_xmlrpc_fault_get_type ()")] [GIR (name = "XMLRPCFault")] public errordomain Fault { PARSE_ERROR_NOT_WELL_FORMED, @@ -1634,7 +1634,7 @@ namespace Soup { CLOSING, CLOSED } - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_REQUEST_ERROR_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_REQUEST_ERROR_", type_id = "soup_request_error_get_type ()")] [Version (since = "2.42")] public errordomain RequestError { BAD_URI, @@ -1643,13 +1643,13 @@ namespace Soup { ENCODING; public static GLib.Quark quark (); } - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_REQUESTER_ERROR_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_REQUESTER_ERROR_", type_id = "soup_requester_error_get_type ()")] public errordomain RequesterError { BAD_URI, UNSUPPORTED_URI_SCHEME; public static GLib.Quark quark (); } - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_TLD_ERROR_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_TLD_ERROR_", type_id = "soup_tld_error_get_type ()")] [Version (since = "2.40")] public errordomain TLDError { INVALID_HOSTNAME, diff --git a/vapi/libsoup-3.0.vapi b/vapi/libsoup-3.0.vapi index 9fd12137c..137aec9f2 100644 --- a/vapi/libsoup-3.0.vapi +++ b/vapi/libsoup-3.0.vapi @@ -871,7 +871,7 @@ namespace Soup { CLOSING, CLOSED } - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SESSION_ERROR_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_SESSION_ERROR_", type_id = "soup_session_error_get_type ()")] public errordomain SessionError { PARSING, ENCODING, @@ -882,7 +882,7 @@ namespace Soup { MESSAGE_ALREADY_IN_QUEUE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_TLD_ERROR_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_TLD_ERROR_", type_id = "soup_tld_error_get_type ()")] public errordomain TLDError { INVALID_HOSTNAME, IS_IP_ADDRESS, @@ -891,7 +891,7 @@ namespace Soup { NO_PSL_DATA; public static GLib.Quark quark (); } - [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_WEBSOCKET_ERROR_")] + [CCode (cheader_filename = "libsoup/soup.h", cprefix = "SOUP_WEBSOCKET_ERROR_", type_id = "soup_websocket_error_get_type ()")] public errordomain WebsocketError { FAILED, NOT_WEBSOCKET, diff --git a/vapi/packagekit-glib2.vapi b/vapi/packagekit-glib2.vapi index 274e1207f..630c486c4 100644 --- a/vapi/packagekit-glib2.vapi +++ b/vapi/packagekit-glib2.vapi @@ -1872,7 +1872,7 @@ namespace Pk { [Version (replacement = "UpgradeKindEnum.to_string", since = "0.6.11")] public unowned string enum_to_string (); } - [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CLIENT_ERROR_")] + [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CLIENT_ERROR_", type_id = "pk_client_error_get_type ()")] public errordomain ClientError { FAILED, FAILED_AUTH, @@ -1889,14 +1889,14 @@ namespace Pk { [Version (since = "0.5.2")] public static GLib.Quark quark (); } - [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CONTROL_ERROR_")] + [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_CONTROL_ERROR_", type_id = "pk_control_error_get_type ()")] public errordomain ControlError { FAILED, CANNOT_START_DAEMON; [Version (since = "0.5.2")] public static GLib.Quark quark (); } - [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_OFFLINE_ERROR_")] + [CCode (cheader_filename = "packagekit-glib2/packagekit.h", cprefix = "PK_OFFLINE_ERROR_", type_id = "pk_offline_error_get_type ()")] public errordomain OfflineError { FAILED, INVALID_VALUE, diff --git a/vapi/pango.vapi b/vapi/pango.vapi index a29ff268e..5e28d2ec3 100644 --- a/vapi/pango.vapi +++ b/vapi/pango.vapi @@ -1221,7 +1221,7 @@ namespace Pango { CHAR, WORD_CHAR } - [CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_LAYOUT_DESERIALIZE_")] + [CCode (cheader_filename = "pango/pango.h", cprefix = "PANGO_LAYOUT_DESERIALIZE_", type_id = "pango_layout_deserialize_error_get_type ()")] [Version (since = "1.50")] public errordomain LayoutDeserializeError { INVALID, diff --git a/vapi/polkit-gobject-1.vapi b/vapi/polkit-gobject-1.vapi index 8f2e9d6b4..d0f7866d9 100644 --- a/vapi/polkit-gobject-1.vapi +++ b/vapi/polkit-gobject-1.vapi @@ -208,7 +208,7 @@ namespace Polkit { public static bool from_string (string string, Polkit.ImplicitAuthorization out_implicit_authorization); public unowned string to_string (); } - [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_ERROR_")] + [CCode (cheader_filename = "polkit/polkit.h", cprefix = "POLKIT_ERROR_", type_id = "polkit_error_get_type ()")] public errordomain Error { FAILED, CANCELLED, diff --git a/vapi/poppler-glib.vapi b/vapi/poppler-glib.vapi index eb58a2b61..25201ac1c 100644 --- a/vapi/poppler-glib.vapi +++ b/vapi/poppler-glib.vapi @@ -1483,7 +1483,7 @@ namespace Poppler { DISPLAY_DOC_TITLE, DIRECTION_RTL } - [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ERROR_")] + [CCode (cheader_filename = "poppler.h", cprefix = "POPPLER_ERROR_", type_id = "poppler_error_get_type ()")] public errordomain Error { INVALID, ENCRYPTED, diff --git a/vapi/rest-0.7.vapi b/vapi/rest-0.7.vapi index 903a53631..c3dbb9ecc 100644 --- a/vapi/rest-0.7.vapi +++ b/vapi/rest-0.7.vapi @@ -206,12 +206,12 @@ namespace Rest { PLAINTEXT, HMAC_SHA1 } - [CCode (cheader_filename = "rest/rest-proxy-call.h", cprefix = "REST_PROXY_CALL_")] + [CCode (cheader_filename = "rest/rest-proxy-call.h", cprefix = "REST_PROXY_CALL_", type_id = "rest_proxy_call_error_get_type ()")] public errordomain ProxyCallError { FAILED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "rest/rest-proxy.h", cprefix = "REST_PROXY_ERROR_")] + [CCode (cheader_filename = "rest/rest-proxy.h", cprefix = "REST_PROXY_ERROR_", type_id = "rest_proxy_error_get_type ()")] public errordomain ProxyError { CANCELLED, RESOLUTION, diff --git a/vapi/udisks2.vapi b/vapi/udisks2.vapi index 34b87b37a..bef17e094 100644 --- a/vapi/udisks2.vapi +++ b/vapi/udisks2.vapi @@ -901,7 +901,7 @@ namespace UDisks { CREATE_ONLY, SYSTEM } - [CCode (cheader_filename = "udisks/udisks.h", cprefix = "UDISKS_ERROR_")] + [CCode (cheader_filename = "udisks/udisks.h", cprefix = "UDISKS_ERROR_", type_id = "udisks_error_get_type ()")] public errordomain Error { FAILED, CANCELLED, diff --git a/vapi/webkit2gtk-4.0.vapi b/vapi/webkit2gtk-4.0.vapi index 3e7405db9..844b0b470 100644 --- a/vapi/webkit2gtk-4.0.vapi +++ b/vapi/webkit2gtk-4.0.vapi @@ -2007,26 +2007,26 @@ namespace WebKit { DOM_CACHE, ALL } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_DOWNLOAD_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_DOWNLOAD_ERROR_", type_id = "webkit_download_error_get_type ()")] public errordomain DownloadError { NETWORK, CANCELLED_BY_USER, DESTINATION; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_FAVICON_DATABASE_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_FAVICON_DATABASE_ERROR_", type_id = "webkit_favicon_database_error_get_type ()")] public errordomain FaviconDatabaseError { NOT_INITIALIZED, FAVICON_NOT_FOUND, FAVICON_UNKNOWN; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_JAVASCRIPT_ERROR_SCRIPT_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_JAVASCRIPT_ERROR_SCRIPT_", type_id = "webkit_javascript_error_get_type ()")] public errordomain JavascriptError { FAILED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_NETWORK_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_NETWORK_ERROR_", type_id = "webkit_network_error_get_type ()")] public errordomain NetworkError { FAILED, TRANSPORT, @@ -2035,7 +2035,7 @@ namespace WebKit { FILE_DOES_NOT_EXIST; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PLUGIN_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PLUGIN_ERROR_", type_id = "webkit_plugin_error_get_type ()")] public errordomain PluginError { FAILED, CANNOT_FIND_PLUGIN, @@ -2045,7 +2045,7 @@ namespace WebKit { WILL_HANDLE_LOAD; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_POLICY_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_POLICY_ERROR_", type_id = "webkit_policy_error_get_type ()")] public errordomain PolicyError { FAILED, CANNOT_SHOW_MIME_TYPE, @@ -2054,26 +2054,26 @@ namespace WebKit { CANNOT_USE_RESTRICTED_PORT; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PRINT_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PRINT_ERROR_", type_id = "webkit_print_error_get_type ()")] public errordomain PrintError { GENERAL, PRINTER_NOT_FOUND, INVALID_PAGE_RANGE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_SNAPSHOT_ERROR_FAILED_TO_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_SNAPSHOT_ERROR_FAILED_TO_", type_id = "webkit_snapshot_error_get_type ()")] public errordomain SnapshotError { CREATE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_CONTENT_FILTER_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_CONTENT_FILTER_ERROR_", type_id = "webkit_user_content_filter_error_get_type ()")] [Version (since = "2.24")] public errordomain UserContentFilterError { INVALID_SOURCE, NOT_FOUND; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_MESSAGE_UNHANDLED_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_MESSAGE_UNHANDLED_", type_id = "webkit_user_message_error_get_type ()")] [Version (since = "2.28")] public errordomain UserMessageError { MESSAGE; diff --git a/vapi/webkit2gtk-5.0.vapi b/vapi/webkit2gtk-5.0.vapi index 7937eceb5..adfeb02b3 100644 --- a/vapi/webkit2gtk-5.0.vapi +++ b/vapi/webkit2gtk-5.0.vapi @@ -1996,26 +1996,26 @@ namespace WebKit { DOM_CACHE, ALL } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_DOWNLOAD_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_DOWNLOAD_ERROR_", type_id = "webkit_download_error_get_type ()")] public errordomain DownloadError { NETWORK, CANCELLED_BY_USER, DESTINATION; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_FAVICON_DATABASE_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_FAVICON_DATABASE_ERROR_", type_id = "webkit_favicon_database_error_get_type ()")] public errordomain FaviconDatabaseError { NOT_INITIALIZED, FAVICON_NOT_FOUND, FAVICON_UNKNOWN; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_JAVASCRIPT_ERROR_SCRIPT_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_JAVASCRIPT_ERROR_SCRIPT_", type_id = "webkit_javascript_error_get_type ()")] public errordomain JavascriptError { FAILED; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_NETWORK_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_NETWORK_ERROR_", type_id = "webkit_network_error_get_type ()")] public errordomain NetworkError { FAILED, TRANSPORT, @@ -2024,7 +2024,7 @@ namespace WebKit { FILE_DOES_NOT_EXIST; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PLUGIN_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PLUGIN_ERROR_", type_id = "webkit_plugin_error_get_type ()")] public errordomain PluginError { FAILED, CANNOT_FIND_PLUGIN, @@ -2034,7 +2034,7 @@ namespace WebKit { WILL_HANDLE_LOAD; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_POLICY_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_POLICY_ERROR_", type_id = "webkit_policy_error_get_type ()")] public errordomain PolicyError { FAILED, CANNOT_SHOW_MIME_TYPE, @@ -2043,26 +2043,26 @@ namespace WebKit { CANNOT_USE_RESTRICTED_PORT; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PRINT_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_PRINT_ERROR_", type_id = "webkit_print_error_get_type ()")] public errordomain PrintError { GENERAL, PRINTER_NOT_FOUND, INVALID_PAGE_RANGE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_SNAPSHOT_ERROR_FAILED_TO_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_SNAPSHOT_ERROR_FAILED_TO_", type_id = "webkit_snapshot_error_get_type ()")] public errordomain SnapshotError { CREATE; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_CONTENT_FILTER_ERROR_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_CONTENT_FILTER_ERROR_", type_id = "webkit_user_content_filter_error_get_type ()")] [Version (since = "2.24")] public errordomain UserContentFilterError { INVALID_SOURCE, NOT_FOUND; public static GLib.Quark quark (); } - [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_MESSAGE_UNHANDLED_")] + [CCode (cheader_filename = "webkit2/webkit2.h", cprefix = "WEBKIT_USER_MESSAGE_UNHANDLED_", type_id = "webkit_user_message_error_get_type ()")] [Version (since = "2.28")] public errordomain UserMessageError { MESSAGE; -- GitLab