From: Juerg Billeter <j@bitron.ch>
Date: Mon, 18 Feb 2008 21:21:05 +0000 (+0000)
Subject: support delegates throwing exceptions, patch by Andrea Del Signore, fixes
X-Git-Tag: VALA_0_1_7~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=121d20f5ec091c79506b3757386cf66b2d8a5ba7;p=thirdparty%2Fvala.git

support delegates throwing exceptions, patch by Andrea Del Signore, fixes

2008-02-18  Juerg Billeter  <j@bitron.ch>

	* gobject/valaccodegenerator.vala: support delegates throwing
	  exceptions, patch by Andrea Del Signore, fixes bug 517024

svn path=/trunk/; revision=1016
---

diff --git a/ChangeLog b/ChangeLog
index 6a9893d37..a0a8997c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-18  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodegenerator.vala: support delegates throwing
+	  exceptions, patch by Andrea Del Signore, fixes bug 517024
+
 2008-02-18  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/packages/gnet-2.0/: update to use vala-gen-introspect
diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index 3a80e68e7..417f17a3b 100644
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -3148,6 +3148,11 @@ public class Vala.CCodeGenerator : CodeGenerator {
 
 		}
 
+		if (m.get_error_domains ().size > 0) {
+			var cparam = new CCodeFormalParameter ("error", "GError**");
+			cparam_map.set (get_param_pos (-1), cparam);
+		}
+
 		// append C parameters in the right order
 		int last_pos = -1;
 		int min_pos;
@@ -3197,6 +3202,10 @@ public class Vala.CCodeGenerator : CodeGenerator {
 			i++;
 		}
 
+		if (m.get_error_domains ().size > 0) {
+			carg_map.set (get_param_pos (-1), new CCodeIdentifier ("error"));
+		}
+
 		var ccall = new CCodeFunctionCall (new CCodeIdentifier (m.get_cname ()));
 
 		// append C arguments in the right order