From: Dana Jansens Date: Sun, 10 Oct 2010 00:11:28 +0000 (-0400) Subject: Allow XIncludes in xml documents we read. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=4f8503c2c5aa4210c923269626b67c5919326c46;p=chaz%2Fopenbox Allow XIncludes in xml documents we read. Add the XInclude namespace in the default config file (named "xi") --- diff --git a/data/rc.xml b/data/rc.xml index 21b0c87f..7faa2550 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -3,7 +3,8 @@ - + 10 diff --git a/doc/rc-mouse-focus.xml b/doc/rc-mouse-focus.xml index e0453214..06c3ce54 100644 --- a/doc/rc-mouse-focus.xml +++ b/doc/rc-mouse-focus.xml @@ -3,7 +3,8 @@ - + 10 diff --git a/obt/xml.c b/obt/xml.c index ffff1500..69810d77 100644 --- a/obt/xml.c +++ b/obt/xml.c @@ -135,7 +135,8 @@ 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_RECOVER | + XML_PARSE_XINCLUDE)); if (i->doc) { i->root = xmlDocGetRootElement(i->doc); if (!i->root) {