From: Jürg Billeter <j@bitron.ch>
Date: Fri, 3 Apr 2009 21:09:50 +0000 (+0200)
Subject: More error domain declaration fixes
X-Git-Tag: 0.7.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb41c3e355eeb9ca53eaf1777e67f97cd98ccc9f;p=thirdparty%2Fvala.git

More error domain declaration fixes

Fixes bug 577738.
---

diff --git a/gobject/valaccodebasemodule.vala b/gobject/valaccodebasemodule.vala
index c5d2df61b..847ac91f8 100644
--- a/gobject/valaccodebasemodule.vala
+++ b/gobject/valaccodebasemodule.vala
@@ -1117,6 +1117,11 @@ internal class Vala.CCodeBaseModule : CCodeModule {
 		} else if (type is ArrayType) {
 			var array_type = (ArrayType) type;
 			generate_type_declaration (array_type.element_type, decl_space);
+		} else if (type is ErrorType) {
+			var error_type = (ErrorType) type;
+			if (error_type.error_domain != null) {
+				generate_error_domain_declaration (error_type.error_domain, decl_space);
+			}
 		}
 
 		foreach (DataType type_arg in type.get_type_arguments ()) {
diff --git a/gobject/valaccodemethodmodule.vala b/gobject/valaccodemethodmodule.vala
index 4efab199b..a404a557d 100644
--- a/gobject/valaccodemethodmodule.vala
+++ b/gobject/valaccodemethodmodule.vala
@@ -105,6 +105,10 @@ internal class Vala.CCodeMethodModule : CCodeStructModule {
 		}
 
 		if (m.get_error_types ().size > 0) {
+			foreach (DataType error_type in m.get_error_types ()) {
+				generate_type_declaration (error_type, decl_space);
+			}
+
 			var cparam = new CCodeFormalParameter ("error", "GError**");
 			cparam_map.set (get_param_pos (-1), cparam);
 			if (carg_map != null) {