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 21b0c87f0a9f49cc45f6ef381158dc47a647094e..7faa2550238cfd70b84a4a5c615c1698ff6de14f 100644 (file)
--- 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 e045321407d1dfb7235e0322bc4a9357873be70a..06c3ce543ba000359270f4d2c38d3b03d0a5583a 100644 (file)
--- 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>

diff --git a/obt/xml.c b/obt/xml.c
index ffff1500e16d341b430584de1b132a027a5726d1..69810d77ee9374a1b3c46b20aa3ff038f84d70df 100644 (file)
--- 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) {