[gxml: 29/29] Attr.vala: fix a merge conflict

[Richard Hans Schwarting <rschwart src gnome org>]

commit 8843bc5995fae332caf8ea4f927bb606c46ebe15
Merge: 8bfae8a d2a5ab9
Author: Richard Schwarting <aquarichy gmail com>
Date:   Sat Nov 16 15:34:46 2013 -0500

    Attr.vala: fix a merge conflict

 DESIGN                        |  102 ++++++++++++
 gxml/Attr.vala                |  174 +++++++++------------
 gxml/BackedNode.vala          |   36 ++---
 gxml/Document.vala            |   62 ++------
 gxml/Element.vala             |  161 ++-----------------
 gxml/Error.vala               |   15 ++
 gxml/Makefile.am              |   18 ++-
 gxml/NamedNodeMap.vala        |  147 +++++++++++++++++
 gxml/NamespaceAttr.vala       |    2 +-
 gxml/Node.vala                |   41 ++++-
 gxml/NodeList.vala            |   27 ++--
 gxml/XPathError.vala          |   43 +++++
 gxml/XPathExpression.vala     |  117 ++++++++++++++
 gxml/XPathNSResolver.vala     |   64 ++++++++
 gxml/XPathResult.vala         |  208 ++++++++++++++++++++++++
 test/DocumentTest.vala        |    6 +-
 test/ElementTest.vala         |   21 ++--
 test/GXmlTest.vala            |   12 ++-
 test/Makefile.am              |    5 +
 test/SerializableTest.vala    |    2 +-
 test/SerializationTest.vala   |    3 +-
 test/XPathExpressionTest.vala |  353 +++++++++++++++++++++++++++++++++++++++++
 test/XPathNSResolverTest.vala |   22 +++
 test/XPathResultTest.vala     |  153 ++++++++++++++++++
 test/test_invalid.xml         |    4 +
 test/test_with_ns.xml         |   63 ++++++++
 vapi/libxml-2.0.vapi          |   24 +++
 27 files changed, 1522 insertions(+), 363 deletions(-)
---
diff --cc gxml/Attr.vala
index 8d62357,fe64883..3797773
--- a/gxml/Attr.vala
+++ b/gxml/Attr.vala
@@@ -108,21 -71,10 +71,11 @@@ namespace GXml 
  
                /* Public properties (Node general) */
  
-               /**
-                * The node_name of an attribute is the attribute's name.
-                *
-                * Do not free this.  It's memory will be released
-                * when the owning { link GXml.Document} is freed.
-                */
-               public override string node_name {
-                       get {
-                               return this.node->name;
-                       }
-                       internal set {
-                       }
-               }
- 
++              /* TODO:NEWATTR: this field, it was suggested, was not in HEAD but was in newattr; that seems 
backwards */
                private string _node_value;
+               /* TODO: find out how to get these to appear in GtkDocs, since they're
+                  overriding a base class.  Figure out how to get that multiple lines to
+                  appear in the generated valadoc */
                /**
                 * The node_value for an attribute is a string
                 * representing the contents of the Attr's tree of
diff --cc gxml/Element.vala
index 2753219,d6c82ea..a3a2ee5
--- a/gxml/Element.vala
+++ b/gxml/Element.vala
@@@ -237,9 -136,8 +136,9 @@@ namespace GXml 
                        if (attr != null)
                                return attr.value;
                        else
-                               return ""; // IDL says empty string, TODO: consider null instead
+                               return ""; // IDL says empty string
                }
 +
                /**
                 * Set the value of this element's attribute named
                 * name to the string value.