]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
vala: Set GLib.Error as symbol of error-types if no error-domain was given
authorRico Tzschichholz <ricotz@ubuntu.com>
Sat, 9 Nov 2019 14:20:11 +0000 (15:20 +0100)
committerRico Tzschichholz <ricotz@ubuntu.com>
Sat, 9 Nov 2019 14:20:11 +0000 (15:20 +0100)
vala/valaerrortype.vala
valadoc/symbolresolver.vala

index 26edcaddd608b316464c79d52233ab16e0b215d3..4fc6156e252521e84f57acea99871c0a638d6527 100644 (file)
@@ -44,7 +44,7 @@ public class Vala.ErrorType : ReferenceType {
        public bool dynamic_error { get; set; }
 
        public ErrorType (ErrorDomain? error_domain, ErrorCode? error_code, SourceReference? source_reference = null) {
-               base (error_domain);
+               base ((Symbol) error_domain ?? CodeContext.get ().root.scope.lookup ("GLib").scope.lookup ("Error"));
                this.error_code = error_code;
                this.source_reference = source_reference;
        }
index 94b2bc460bbac96ad893a0d9d27112994e418937..20021c5fa59f4eae67a5f90ea8f41d7ebdce1d48 100644 (file)
@@ -41,7 +41,7 @@ public class Valadoc.SymbolResolver : Visitor {
                var error_types = new Vala.ArrayList<Vala.DataType> ();
                vala_symbol.get_error_types (error_types);
                foreach (Vala.DataType type in error_types) {
-                       unowned Vala.ErrorDomain vala_edom = (Vala.ErrorDomain) type.type_symbol;
+                       unowned Vala.ErrorDomain? vala_edom = ((Vala.ErrorType) type).error_domain;
                        Symbol? edom = symbol_map.get (vala_edom);
                        symbol.add_child (edom ?? glib_error);
                }