codegen: Fix detailed signal disconnect in async methods

Fixes bug 742621

diff --git a/codegen/valagsignalmodule.vala b/codegen/valagsignalmodule.vala
index 3f8e1ea1e81c6c087dbab28c2ed63969b27d3c27..eff678162add21cf2ecfd40949df5b83abc04b88 100644 (file)
--- a/codegen/valagsignalmodule.vala
+++ b/codegen/valagsignalmodule.vala
@@ -618,7 +618,7 @@ public class Vala.GSignalModule : GObjectModule {
                        } else {
                                detail_temp_decl = get_temp_variable (gquark_type);
                                emit_temp_var (detail_temp_decl);
-                               parse_call.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier (detail_temp_decl.name)));
+                               parse_call.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, get_variable_cexpression (detail_temp_decl.name)));
                                parse_call.add_argument (new CCodeConstant ("TRUE"));
                        }
                        ccode.add_expression (parse_call);

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a9bd40fe1371da6ef0e617aed68b9f803d412491..73fe7e366eac0e0d51ba41c5362d48a9984cc351 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -190,6 +190,7 @@ TESTS = \
        asynchronous/bug654336.vala \
        asynchronous/bug654337.vala \
        asynchronous/bug661961.vala \
+       asynchronous/bug742621.vala \
        asynchronous/closures.vala \
        dbus/basic-types.test \
        dbus/arrays.test \

diff --git a/tests/asynchronous/bug742621.vala b/tests/asynchronous/bug742621.vala
new file mode 100644 (file)
index 0000000..1577caf
--- /dev/null
+++ b/tests/asynchronous/bug742621.vala
@@ -0,0 +1,15 @@
+class Xyzzy : Object {
+    public bool b { get; set; }
+}
+
+Xyzzy? xyzzy = null;
+
+private void on_b() {
+}
+
+async void go_async() throws Error {
+    xyzzy.notify["b"].disconnect(on_b);
+}
+
+void main () {
+}