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

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

svn path=/trunk/; revision=1522

diff --git a/ChangeLog b/ChangeLog
index 309e858..30a6198 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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
+
+2008-05-31  Jürg Billeter  <j@bitron.ch>
+
        * vapi/packages/gstreamer-0.10/:
 
        Fix gst_value_get_buffer and gst_value_get_structure bindings,

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index ad56ecb..ff6f076 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -270,14 +270,17 @@ public abstract class Vala.DataType : CodeNode {
                        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;
                }