all repos — openbox @ 4f8503c2c5aa4210c923269626b67c5919326c46

openbox fork - make it a bit more like ryudo 

Allow XIncludes in xml documents we read.

Add the XInclude namespace in the default config file (named "xi")
Dana Jansens danakj@orodu.net
commit

4f8503c2c5aa4210c923269626b67c5919326c46

parent

6dedf8f37e00a61e4b0d3762b869ed39eeee77f8

3 files changed, 6 insertions(+), 3 deletions(-)

jump to
M data/rc.xml → 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>
M doc/rc-mouse-focus.xml → 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>
M obt/xml.c → obt/xml.c 
@@ -135,7 +135,8 @@ if (stat(path, &s) >= 0) {
             /* 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) {