From: Maciej Piechotka <uzytkownik2@gmail.com>
Date: Mon, 19 Dec 2011 02:24:28 +0000 (+0100)
Subject: Merge attributes on merge of namespace
X-Git-Tag: 0.17.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4de3f6e7958557e8beb5eb73ffefb251433e6157;p=thirdparty%2Fvala.git

Merge attributes on merge of namespace

On merge the attribute of second namespace were silently ignored. This patch
treats them as they were specified sequentially.

Fixes bug 666478.
---

diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala
index 7506e25db..b605ac646 100644
--- a/vala/valanamespace.vala
+++ b/vala/valanamespace.vala
@@ -129,6 +129,11 @@ public class Vala.Namespace : Symbol {
 			foreach (Comment c in ns.get_comments ()) {
 				old_ns.add_comment (c);
 			}
+			foreach (Attribute a in ns.attributes) {
+				if (old_ns.get_attribute (a.name) == null) {
+					old_ns.attributes.append(a);
+				}
+			}
 		} else {
 			namespaces.add (ns);
 			scope.add (ns.name, ns);