From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Sat, 9 Nov 2019 14:20:11 +0000 (+0100)
Subject: vala: Set GLib.Error as symbol of error-types if no error-domain was given
X-Git-Tag: 0.47.1~5
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=bdd13823bd64275361f7af9fb78a4e31dd13270f;p=thirdparty%2Fvala.git

vala: Set GLib.Error as symbol of error-types if no error-domain was given
---

diff --git a/vala/valaerrortype.vala b/vala/valaerrortype.vala
index 26edcaddd..4fc6156e2 100644
--- a/vala/valaerrortype.vala
+++ b/vala/valaerrortype.vala
@@ -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;
 	}
diff --git a/valadoc/symbolresolver.vala b/valadoc/symbolresolver.vala
index 94b2bc460..20021c5fa 100644
--- a/valadoc/symbolresolver.vala
+++ b/valadoc/symbolresolver.vala
@@ -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);
 		}