vala r1114 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Sat Mar  8 20:00:22 2008
New Revision: 1114
URL: http://svn.gnome.org/viewvc/vala?rev=1114&view=rev

Log:
2008-03-08  Juerg Billeter  <j bitron ch>

	* gobject/valaccodegenerator.vala: fix exception handling in
	  property accessors, fixes bug 520936


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodegenerator.vala

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Sat Mar  8 20:00:22 2008
@@ -627,6 +627,7 @@
 
 	public override void visit_property_accessor (PropertyAccessor! acc) {
 		current_property_accessor = acc;
+		current_method_inner_error = false;
 
 		var prop = (Property) acc.prop;
 
@@ -771,6 +772,12 @@
 
 			function.block = (CCodeBlock) acc.body.ccodenode;
 
+			if (current_method_inner_error) {
+				var cdecl = new CCodeDeclaration ("GError *");
+				cdecl.add_declarator (new CCodeVariableDeclarator.with_initializer ("inner_error", new CCodeConstant ("NULL")));
+				function.block.prepend_statement (cdecl);
+			}
+
 			if (returns_real_struct) {
 				function.block.prepend_statement (create_property_type_check_statement (prop, false, t, true, "self"));
 			} else {