From: Dana Jansens <danakj@orodu.net>
Date: Sat, 16 Oct 2010 19:32:35 +0000 (-0400)
Subject: XML_PARSE_XINCLUDE flag seems to do nothing. Use xmlXIncludeProcessFlags() instead
X-Git-Tag: mikabox-3.5-7~166
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=80b6d4ac5d6a039a8e3976a52490200ed803566e

XML_PARSE_XINCLUDE flag seems to do nothing. Use xmlXIncludeProcessFlags() instead
---

diff --git a/obt/xml.c b/obt/xml.c
index 69810d7..c872912 100644
--- a/obt/xml.c
+++ b/obt/xml.c
@@ -19,6 +19,7 @@
 #include "obt/xml.h"
 #include "obt/paths.h"
 
+#include <libxml/xinclude.h>
 #include <glib.h>
 
 #ifdef HAVE_STDLIB_H
@@ -135,8 +136,9 @@ static gboolean load_file(ObtXmlInst *i,
             /* XML_PARSE_BLANKS is needed apparently, or the tree can end up
                with extra nodes in it. */
             i->doc = xmlReadFile(path, NULL, (XML_PARSE_NOBLANKS |
-                                              XML_PARSE_RECOVER |
-                                              XML_PARSE_XINCLUDE));
+                                              XML_PARSE_RECOVER));
+            xmlXIncludeProcessFlags(i->doc, (XML_PARSE_NOBLANKS |
+                                             XML_PARSE_RECOVER));
             if (i->doc) {
                 i->root = xmlDocGetRootElement(i->doc);
                 if (!i->root) {