vala r1522 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat May 31 19:10:14 2008
New Revision: 1522
URL: http://svn.gnome.org/viewvc/vala?rev=1522&view=rev

Log:
2008-05-31  JÃrg Billeter  <j bitron ch>

	* vala/valadatatype.vala:

	Don't complain about incompatible signal handlers when using
	signals in generic types


Modified:
   trunk/ChangeLog
   trunk/vala/valadatatype.vala

Modified: trunk/vala/valadatatype.vala
==============================================================================
--- trunk/vala/valadatatype.vala	(original)
+++ trunk/vala/valadatatype.vala	Sat May 31 19:10:14 2008
@@ -270,14 +270,17 @@
 			return false;
 		}
 
+		/* temporarily ignore type parameters */
+		if (type_parameter != null || type2.type_parameter != null) {
+			return true;
+		}
+
 		if (type2.data_type != data_type) {
 			// FIXME: allow this type reference to refer to a
 			//        subtype of the type type2 is referring to
 			return false;
 		}
-		if (type2.type_parameter != type_parameter) {
-			return false;
-		}
+
 		if (type2.floating_reference != floating_reference) {
 			return false;
 		}