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 7506e25db5d0196cf2523fa8018c105ec75425f8..b605ac646cc44b5f664082cc9faca2d5029d05a9 100644 (file)
--- 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);