From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 13 Jun 2013 18:16:25 +0000 (+0200)
Subject: girwriter: Don't emit scope async and notified at the same time
X-Git-Tag: 0.21.1~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5608074cc3cc145cc028af73387aa4bbab63a19;p=thirdparty%2Fvala.git

girwriter: Don't emit scope async and notified at the same time

Fixes bug 702180
---

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index 073dd8a78..01e94db66 100644
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -1214,12 +1214,10 @@ public class Vala.GIRWriter : CodeVisitor {
 			int closure_index = is_parameter ?
 				index + 1 : (type.value_owned ? index - 1 : index);
 			buffer.append_printf (" closure=\"%i\"", closure_index);
-			if (type.value_owned) {
-				buffer.append_printf (" scope=\"notified\" destroy=\"%i\"", closure_index + 1);
-			}
-
 			if (delegate_type.is_called_once) {
 				buffer.append (" scope=\"async\"");
+			} else if (type.value_owned) {
+				buffer.append_printf (" scope=\"notified\" destroy=\"%i\"", closure_index + 1);
 			}
 		}