Merge branch '1.0'

Conflicts:
	mana.cbp
	mana.files
	src/CMakeLists.txt
	src/Makefile.am
	src/utils/xml.cpp

1 files changed, 3 insertions, 20 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 0dd00f56..f3962c40 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,11 +21,10 @@
 
 #include "main.h"
 
-#include "utils/gettext.h"
-
 #include "client.h"
 
-#include <libxml/parser.h>
+#include "utils/gettext.h"
+#include "utils/xml.h"
 
 #include <getopt.h>
 #include <iostream>
@@ -186,22 +185,6 @@ static void initInternationalization()
 #endif
 }
 
-static void xmlNullLogger(void *ctx, const char *msg, ...)
-{
-    // Does nothing, that's the whole point of it
-}
-
-// Initialize libxml2 and check for potential ABI mismatches between
-// compiled version and the shared library actually used.
-static void initXML()
-{
-    xmlInitParser();
-    LIBXML_TEST_VERSION;
-
-    // Suppress libxml2 error messages
-    xmlSetGenericErrorFunc(NULL, xmlNullLogger);
-}
-
 
 int main(int argc, char *argv[])
 {
@@ -235,7 +218,7 @@ int main(int argc, char *argv[])
     }
     atexit((void(*)()) PHYSFS_deinit);
 
-    initXML();
+    XML::init();
 
     Client client(options);
     return client.exec();