projects
/
dana
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c5c34cc
)
XML_PARSE_XINCLUDE flag seems to do nothing. Use xmlXIncludeProcessFlags() instead
author
Dana Jansens
<danakj@orodu.net>
Sat, 16 Oct 2010 19:32:35 +0000
(15:32 -0400)
committer
Dana Jansens
<danakj@orodu.net>
Mon, 24 Jan 2011 19:19:23 +0000
(14:19 -0500)
obt/xml.c
patch
|
blob
|
history
diff --git
a/obt/xml.c
b/obt/xml.c
index
69810d7
..
c872912
100644
(file)
--- a/
obt/xml.c
+++ b/
obt/xml.c
@@
-19,6
+19,7
@@
#include "obt/xml.h"
#include "obt/paths.h"
#include "obt/xml.h"
#include "obt/paths.h"
+#include <libxml/xinclude.h>
#include <glib.h>
#ifdef HAVE_STDLIB_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_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) {
if (i->doc) {
i->root = xmlDocGetRootElement(i->doc);
if (!i->root) {