vala: Using SignalHandler.disconnect() is required for dynamic signals

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 036c809b9b93c51e3ffcb0c7afc0188f8f6521b4..0ae4634a9ce2a2ebcc0b9e7cdd9e8a28318756f8 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -515,6 +515,7 @@ TESTS = \
        objects/signals-enum-marshal.vala \
        objects/signals-delegate.vala \
        objects/signals-delegate-parameter.vala \
+       objects/signals-dynamic-invalid-disconnect.test \
        objects/signals-dymanic-invalid-handler.test \
        objects/signals-dynamic-lambda-handler.test \
        objects/signals-error-marshal.vala \

diff --git a/tests/objects/signals-dynamic-invalid-disconnect.test b/tests/objects/signals-dynamic-invalid-disconnect.test
new file mode 100644 (file)
index 0000000..e1787ef
--- /dev/null
+++ b/tests/objects/signals-dynamic-invalid-disconnect.test
@@ -0,0 +1,15 @@
+Invalid Code
+
+class Foo : Object {
+       public signal void sig ();
+}
+
+void sig_cb () {
+}
+
+void main () {
+       var real = new Foo ();
+       dynamic Object foo = real;
+
+       foo.sig.disconnect (sig_cb);
+}

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index 2a3abcfb84cc99ceb7c9b57a0353c2418deb4602..10c59d34c0cd6088414ebe551f00573e0051573f 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -469,6 +469,9 @@ public class Vala.MemberAccess : Expression {
                                                s.access = SymbolAccessibility.PUBLIC;
                                                dynamic_object_type.type_symbol.scope.add (null, s);
                                                symbol_reference = s;
+                                       } else if (ma.member_name == "disconnect") {
+                                               error = true;
+                                               Report.error (ma.source_reference, "Use SignalHandler.disconnect() to disconnect from dynamic signal");
                                        }
                                }
                                if (symbol_reference == null) {