all repos — openbox @ 80b6d4ac5d6a039a8e3976a52490200ed803566e

openbox fork - make it a bit more like ryudo 

XML_PARSE_XINCLUDE flag seems to do nothing. Use xmlXIncludeProcessFlags() instead
Dana Jansens danakj@orodu.net
commit

80b6d4ac5d6a039a8e3976a52490200ed803566e

parent

c5c34cca1c9b57424fa7ca686995126f627903ab

1 files changed, 4 insertions(+), 2 deletions(-)

jump to
M obt/xml.c → 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 @@ if (stat(path, &s) >= 0) {
             /* 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) {