Consider unowned and owned types equivalent if they are not disposable

Fixes bug 631920.

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index aa838d1e346f401ca4bc8ae7aa322e2372023d1c..2eccdd54a981a2402661403d94e11ff0c83e5164 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -235,7 +235,7 @@ public abstract class Vala.DataType : CodeNode {
         *              otherwise
         */
        public virtual bool equals (DataType type2) {
-               if (type2.value_owned != value_owned) {
+               if (type2.is_disposable () != is_disposable ()) {
                        return false;
                }
                if (type2.nullable != nullable) {
@@ -267,7 +267,7 @@ public abstract class Vala.DataType : CodeNode {
         * @return      true if this type reference is stricter or equal
         */
        public virtual bool stricter (DataType type2) {
-               if (type2.value_owned != value_owned) {
+               if (type2.is_disposable () != is_disposable ()) {
                        return false;
                }