diff options
| author | Dana Jansens <danakj@orodu.net> | 2010-10-09 20:11:28 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2011-01-24 14:19:22 -0500 |
| commit | 4f8503c2c5aa4210c923269626b67c5919326c46 (patch) | |
| tree | 707d39286679374b53c25937ba05cb322eaefe68 | |
| parent | 6dedf8f37e00a61e4b0d3762b869ed39eeee77f8 (diff) | |
Allow XIncludes in xml documents we read.
Add the XInclude namespace in the default config file (named "xi")
| -rw-r--r-- | data/rc.xml | 3 | ||||
| -rw-r--r-- | doc/rc-mouse-focus.xml | 3 | ||||
| -rw-r--r-- | obt/xml.c | 3 |
3 files changed, 6 insertions, 3 deletions
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 @@ <!-- Do not edit this file, it will be overwritten on install. Copy the file to $HOME/.config/openbox/ instead. --> -<openbox_config xmlns="http://openbox.org/3.4/rc"> +<openbox_config xmlns="http://openbox.org/3.4/rc" + xmlns:xi="http://www.w3.org/2001/XInclude"> <resistance> <strength>10</strength> 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 @@ <!-- Do not edit this file, it will be overwritten on install. Copy the file to $HOME/.config/openbox/ instead. --> -<openbox_config xmlns="http://openbox.org/3.4/rc"> +<openbox_config xmlns="http://openbox.org/3.4/rc" + xmlns:xi="http://www.w3.org/2001/XInclude"> <resistance> <strength>10</strength> @@ -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) { |