vala r2371 - in trunk: . gobject vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat Jan 17 12:56:53 2009
New Revision: 2371
URL: http://svn.gnome.org/viewvc/vala?rev=2371&view=rev

Log:
2009-01-17  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodememberaccessmodule.vala:

	Do not try to convert from generic pointer twice when accessing
	generic field

	* vala/valaassignment.vala:

	Set formal_target_type to fix assignment to generic fields,
	fixes bug 543486


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodememberaccessmodule.vala
   trunk/vala/valaassignment.vala

Modified: trunk/gobject/valaccodememberaccessmodule.vala
==============================================================================
--- trunk/gobject/valaccodememberaccessmodule.vala	(original)
+++ trunk/gobject/valaccodememberaccessmodule.vala	Sat Jan 17 12:56:53 2009
@@ -146,10 +146,6 @@
 			} else {
 				expr.ccodenode = new CCodeIdentifier (f.get_cname ());
 			}
-
-			if (f.field_type.type_parameter != null && expr.value_type.type_parameter == null) {
-				expr.ccodenode = convert_from_generic_pointer ((CCodeExpression) expr.ccodenode, expr.value_type);
-			}
 		} else if (expr.symbol_reference is Constant) {
 			var c = (Constant) expr.symbol_reference;
 			expr.ccodenode = new CCodeIdentifier (c.get_cname ());

Modified: trunk/vala/valaassignment.vala
==============================================================================
--- trunk/vala/valaassignment.vala	(original)
+++ trunk/vala/valaassignment.vala	Sat Jan 17 12:56:53 2009
@@ -139,6 +139,7 @@
 				var sig = (Signal) ma.symbol_reference;
 				right.target_type = new DelegateType (sig.get_delegate (ma.inner.value_type, this));
 			} else {
+				right.formal_target_type = ma.formal_value_type;
 				right.target_type = ma.value_type;
 			}
 		} else if (left is ElementAccess) {