[gxml: 7/7] Merge branch 'gxml-0.8' for 0.8.2 release

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 3fa450544cc37e4849d60e004fcb06015f6bc3fa
Merge: 7ff2a75 bd6d257
Author: Daniel Espinosa <esodan gmail com>
Date:   Wed Jan 13 15:19:57 2016 -0600

    Merge branch 'gxml-0.8' for 0.8.2 release

 NEWS                      |    9 +++++++++
 configure.ac              |    8 ++++++++
 gxml/libxml-Document.vala |   24 +++++++++++++++++++++++-
 test/DocumentTest.vala    |   32 ++++++++++++++++++++++++++++++++
 4 files changed, 72 insertions(+), 1 deletions(-)
---
diff --cc NEWS
index 5c4bb01,24d03eb..14597b5
--- a/NEWS
+++ b/NEWS
@@@ -1,4 -1,11 +1,13 @@@
 -=============
++
++===============
+ Version 0.8.2
 -=============
++===============
+ 
+ * Fixed sigfault on xDocumento.from_stream()
+ * Added test for remote file read using GLib.File
+ 
  =============
++
  Version 0.8.1
  =============
  
diff --cc configure.ac
index 9c0fbb6,b5a93cc..f2ef667
--- a/configure.ac
+++ b/configure.ac
@@@ -12,7 -12,7 +12,11 @@@
  # Release Version
  m4_define([project_major_version], [0])
  m4_define([project_minor_version], [8])
++<<<<<<< HEAD
 +m4_define([project_micro_version], [1])
++=======
+ m4_define([project_micro_version], [2])
++>>>>>>> gxml-0.8
  m4_define([project_nano_version], [0])
  
  # LT_VERSION
@@@ -22,7 -22,7 +26,11 @@@
  #   If public symbols have been added since last release, increment age
  #   If public symbols have been removed since last release, set age to 0
  m4_define([project_lt_current], [8])
++<<<<<<< HEAD
 +m4_define([project_lt_revision], [1])
++=======
+ m4_define([project_lt_revision], [2])
++>>>>>>> gxml-0.8
  m4_define([project_lt_age], [0])
  
  # Combine numbers to various version variables (different uses)
diff --cc gxml/libxml-Document.vala
index 95542f9,831f899..de9975c
--- a/gxml/libxml-Document.vala
+++ b/gxml/libxml-Document.vala
@@@ -442,14 -442,16 +442,26 @@@ namespace GXml 
                                throw new GXml.Error.PARSER (errmsg);
                        }
                        Xmlx.reset_last_error ();
++<<<<<<< HEAD
 +                      e = Xmlx.get_last_error ();
++=======
++>>>>>>> gxml-0.8
                        var doc = Xml.Parser.parse_memory ((string) ostream.data, ((string) 
ostream.data).length);
                        if (doc != null) {
                                this.from_libxml2 (doc);
                        } else {
++<<<<<<< HEAD
 +                              e = Xmlx.get_last_error ();
 +                              if (e != null) {
 +                                      errmsg += ".  " + libxml2_error_to_string (e);
++=======
+                               errmsg = "Parser Error";
+                               e = Xmlx.get_last_error ();
+                               if (e != null) {
+                                       string s = libxml2_error_to_string (e);
+                                       if (s != null)
+                                               errmsg += s;
++>>>>>>> gxml-0.8
                                }
                                GXml.exception (DomException.INVALID_DOC, errmsg);
                                throw new GXml.Error.PARSER (errmsg);
@@@ -491,7 -493,10 +503,14 @@@
                  this.from_libxml2 (doc);
                        var e = Xmlx.get_last_error ();
                        if (e != null) {
++<<<<<<< HEAD
 +                              var errmsg = ".  " + libxml2_error_to_string (e);
++=======
+                               var errmsg = "Parser Error for string";
+                               string s = libxml2_error_to_string (e);
+                               if (s != null)
+                                       errmsg = ".  ";
++>>>>>>> gxml-0.8
                                GXml.exception (DomException.INVALID_DOC, errmsg);
                                throw new GXml.Error.PARSER (errmsg);
                        }
diff --cc test/DocumentTest.vala
index 931b2c0,1dc6956..720e7a3
--- a/test/DocumentTest.vala
+++ b/test/DocumentTest.vala
@@@ -125,6 -125,35 +125,38 @@@ class DocumentTest : GXmlTest 
                                assert_not_reached ();
                        }
                        });
++<<<<<<< HEAD
++=======
+               Test.add_func ("/gxml/document/gfile/remote", () => {
+                       try {
+                               var rf = GLib.File.new_for_uri 
("https://git.gnome.org/browse/gxml/plain/gxml.doap";);
+                               assert (rf.query_exists ());
+                               var d = new xDocument.from_gfile (rf);
+                               assert (d != null);
+                               assert (d.root != null);
+                               assert (d.root.name == "Project");
+                               bool fname, fshordesc, fdescription, fhomepage;
+                               fname = fshordesc = fdescription = fhomepage = false;
+                               foreach (GXml.Node n in d.root.childs) {
+                                       if (n.name == "name") fname = true;
+                                       if (n.name == "shortdesc") fshordesc = true;
+                                       if (n.name == "description") fdescription = true;
+                                       if (n.name == "homepage") fhomepage = true;
+                               }
+                               assert (fname);
+                               assert (fshordesc);
+                               assert (fdescription);
+                               assert (fhomepage);
+                               var f = GLib.File.new_for_path (GXmlTestConfig.TEST_SAVE_DIR+"/xml.doap");
+                               d.save_as (f);
+                               assert (f.query_exists ());
+                               f.delete ();
+                       } catch (GLib.Error e) {
+                               GLib.message ("Error: "+e.message);
+                               assert_not_reached ();
+                       }
+               });
++>>>>>>> gxml-0.8
                Test.add_func ("/gxml/document/construct_from_stream_error", () => {
                                File fin;
                                InputStream instream;