[vala] Merge attributes on merge of namespace

[JÃrg Billeter <juergbi src gnome org>]

commit 4de3f6e7958557e8beb5eb73ffefb251433e6157
Author: Maciej Piechotka <uzytkownik2 gmail com>
Date:   Mon Dec 19 03:24:28 2011 +0100

    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.

 vala/valanamespace.vala |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala
index 7506e25..b605ac6 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);