vala r1249 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Wed Apr 16 22:05:06 2008
New Revision: 1249
URL: http://svn.gnome.org/viewvc/vala?rev=1249&view=rev

Log:
2008-04-16  Juerg Billeter  <j bitron ch>

	* gobject/valaccodegenerator.vala: fix error handling in static
	  constructors, fixes bug 528111


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

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Wed Apr 16 22:05:06 2008
@@ -983,6 +983,16 @@
 		} else {
 			// static class constructor
 			// add to class_init
+
+			if (current_method_inner_error) {
+				/* always separate error parameter and inner_error local variable
+				 * as error may be set to NULL but we're always interested in inner errors
+				 */
+				var cdecl = new CCodeDeclaration ("GError *");
+				cdecl.add_declarator (new CCodeVariableDeclarator.with_initializer ("inner_error", new CCodeConstant ("NULL")));
+				class_init_fragment.append (cdecl);
+			}
+
 			class_init_fragment.append (c.body.ccodenode);
 		}
 	}