nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dana Jansens 2010-10-16 15:32:35 -04:00
parent c5c34cca1c
commit 80b6d4ac5d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
obt/xml.c
View file

@ -19,6 +19,7 @@
#include "obt/xml.h" #include "obt/xml.h"
#include "obt/paths.h" #include "obt/paths.h"
#include <libxml/xinclude.h>
#include <glib.h> #include <glib.h>
#ifdef HAVE_STDLIB_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 /* XML_PARSE_BLANKS is needed apparently, or the tree can end up
with extra nodes in it. */ with extra nodes in it. */
i->doc = xmlReadFile(path, NULL, (XML_PARSE_NOBLANKS | i->doc = xmlReadFile(path, NULL, (XML_PARSE_NOBLANKS |
XML_PARSE_RECOVER | XML_PARSE_RECOVER));
XML_PARSE_XINCLUDE)); xmlXIncludeProcessFlags(i->doc, (XML_PARSE_NOBLANKS |
XML_PARSE_RECOVER));
if (i->doc) { if (i->doc) {
i->root = xmlDocGetRootElement(i->doc); i->root = xmlDocGetRootElement(i->doc);
if (!i->root) { if (!i->root) {