X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fxml.c;h=5b7e77b5cb95c8b2ce94b5efca40cffed2593faa;hb=01f62ded2fe289fe245f4f05b5825f4bdcbe1dc3;hp=ffff1500e16d341b430584de1b132a027a5726d1;hpb=890e13b919892887b773462bb866e849e0cb4d91;p=chaz%2Fopenbox

diff --git a/obt/xml.c b/obt/xml.c
index ffff1500..5b7e77b5 100644
--- a/obt/xml.c
+++ b/obt/xml.c
@@ -19,6 +19,7 @@
 #include "obt/xml.h"
 #include "obt/paths.h"
 
+#include <libxml/xinclude.h>
 #include <glib.h>
 
 #ifdef HAVE_STDLIB_H
@@ -111,6 +112,11 @@ void obt_xml_register(ObtXmlInst *i, const gchar *tag,
     g_hash_table_insert(i->callbacks, c->tag, c);
 }
 
+void obt_xml_unregister(ObtXmlInst *i, const gchar *tag)
+{
+    g_hash_table_remove(i->callbacks, tag);
+}
+
 static gboolean load_file(ObtXmlInst *i,
                           const gchar *domain,
                           const gchar *filename,
@@ -136,6 +142,8 @@ static gboolean load_file(ObtXmlInst *i,
                with extra nodes in it. */
             i->doc = xmlReadFile(path, NULL, (XML_PARSE_NOBLANKS |
                                               XML_PARSE_RECOVER));
+            xmlXIncludeProcessFlags(i->doc, (XML_PARSE_NOBLANKS |
+                                             XML_PARSE_RECOVER));
             if (i->doc) {
                 i->root = xmlDocGetRootElement(i->doc);
                 if (!i->root) {
@@ -313,16 +321,22 @@ void obt_xml_tree_from_root(ObtXmlInst *i)
     obt_xml_tree(i, i->root->children);
 }
 
-gchar *obt_xml_node_string(xmlNodePtr node)
+gchar *obt_xml_node_string_unstripped(xmlNodePtr node)
 {
     xmlChar *c = xmlNodeGetContent(node);
     gchar *s;
-    if (c) g_strstrip((char*)c); /* strip leading/trailing whitespace */
     s = g_strdup(c ? (gchar*)c : "");
     xmlFree(c);
     return s;
 }
 
+gchar *obt_xml_node_string(xmlNodePtr node)
+{
+    gchar* result = obt_xml_node_string_unstripped(node);
+    g_strstrip(result); /* strip leading/trailing whitespace */
+    return result;
+}
+
 gint obt_xml_node_int(xmlNodePtr node)
 {
     xmlChar *c = xmlNodeGetContent(node);
@@ -405,13 +419,12 @@ gboolean obt_xml_attr_int(xmlNodePtr node, const gchar *name, gint *value)
     return r;
 }
 
-gboolean obt_xml_attr_string(xmlNodePtr node, const gchar *name,
-                             gchar **value)
+gboolean obt_xml_attr_string_unstripped(xmlNodePtr node, const gchar *name,
+                                        gchar **value)
 {
     xmlChar *c = xmlGetProp(node, (const xmlChar*) name);
     gboolean r = FALSE;
     if (c) {
-        g_strstrip((char*)c); /* strip leading/trailing whitespace */
         *value = g_strdup((gchar*)c);
         r = TRUE;
     }
@@ -419,6 +432,15 @@ gboolean obt_xml_attr_string(xmlNodePtr node, const gchar *name,
     return r;
 }
 
+gboolean obt_xml_attr_string(xmlNodePtr node, const gchar *name,
+                             gchar **value)
+{
+    gboolean result = obt_xml_attr_string_unstripped(node, name, value);
+    if (result)
+        g_strstrip(*value); /* strip leading/trailing whitespace */
+    return result;
+}
+
 gboolean obt_xml_attr_contains(xmlNodePtr node, const gchar *name,
                                const gchar *val)
 {