From: Jürg Billeter <j@bitron.ch>
Date: Mon, 19 Jan 2009 08:06:38 +0000 (+0000)
Subject: Fix assigning to properties in lambda expressions in creation methods,
X-Git-Tag: 0.5.7~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=714b37aaf6da91b92fa39a9135221daad7b19317;p=thirdparty%2Fvala.git

Fix assigning to properties in lambda expressions in creation methods,

2009-01-19  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodemethodmodule.vala:

	Fix assigning to properties in lambda expressions in creation
	methods, patch by Yu Feng, fixes bug 568267

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

diff --git a/ChangeLog b/ChangeLog
index e370e6b08..ed28a9a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-19  Jürg Billeter  <j@bitron.ch>
+
+	* gobject/valaccodemethodmodule.vala:
+
+	Fix assigning to properties in lambda expressions in creation
+	methods, patch by Yu Feng, fixes bug 568267
+
 2009-01-18  Thijs Vermeir  <thijsvermeir@gmail.com>
 
 	* vapi/packages/gstreamer-0.10/gstreamer-0.10.metadata:
diff --git a/gobject/valaccodemethodmodule.vala b/gobject/valaccodemethodmodule.vala
index de786de27..9f7817ebe 100644
--- a/gobject/valaccodemethodmodule.vala
+++ b/gobject/valaccodemethodmodule.vala
@@ -61,6 +61,7 @@ public class Vala.CCodeMethodModule : CCodeStructModule {
 		Method old_method = current_method;
 		DataType old_return_type = current_return_type;
 		bool old_method_inner_error = current_method_inner_error;
+		bool old_in_creation_method = in_creation_method;
 		int old_next_temp_var_id = next_temp_var_id;
 		var old_variable_name_map = variable_name_map;
 		var old_try = current_try;
@@ -96,6 +97,8 @@ public class Vala.CCodeMethodModule : CCodeStructModule {
 			if (cl != null) {
 				current_return_type = new ObjectType (cl);
 			}
+		} else {
+			in_creation_method = false;
 		}
 
 		var creturn_type = current_return_type;
@@ -153,7 +156,7 @@ public class Vala.CCodeMethodModule : CCodeStructModule {
 				m.body.ccodenode = cblock;
 			}
 
-			in_creation_method = false;
+			in_creation_method = old_in_creation_method;
 		}
 
 		bool inner_error = current_method_inner_error;