update openbox to use the current parser interface in libobt

there is also some random bug fixes for other libobt stuff in here.

4 files changed, 58 insertions, 23 deletions

diff --git a/obt/parse.c b/obt/parse.c
index 68b1b87f..61fe5b82 100644
--- a/obt/parse.c
+++ b/obt/parse.c
@@ -62,7 +62,7 @@ static void destfunc(struct Callback *c)
     g_free(c);
 }
 
-ObtParseInst* obt_parse_instance_new()
+ObtParseInst* obt_parse_instance_new(void)
 {
     ObtParseInst *i = g_new(ObtParseInst, 1);
     i->ref = 1;
@@ -87,8 +87,20 @@ void obt_parse_instance_unref(ObtParseInst *i)
     }
 }
 
-void parse_register(ObtParseInst *i, const gchar *tag,
-                    ObtParseCallback func, gpointer data)
+xmlDocPtr obt_parse_instance_doc(ObtParseInst *i)
+{
+    g_assert(i->doc); /* a doc is open? */
+    return i->doc;
+}
+
+xmlNodePtr obt_parse_instance_root(ObtParseInst *i)
+{
+    g_assert(i->doc); /* a doc is open? */
+    return i->root;
+}
+
+void obt_parse_register(ObtParseInst *i, const gchar *tag,
+                        ObtParseCallback func, gpointer data)
 {
     struct Callback *c;
 
@@ -119,7 +131,10 @@ static gboolean load_file(ObtParseInst *i,
         gchar *path;
         struct stat s;
 
-        path = g_build_filename(it->data, domain, filename, NULL);
+        if (!domain && !filename) /* given a full path to the file */
+            path = g_strdup(it->data);
+        else
+            path = g_build_filename(it->data, domain, filename, NULL);
 
         if (stat(path, &s) >= 0) {
             /* XML_PARSE_BLANKS is needed apparently, or the tree can end up
@@ -154,6 +169,24 @@ static gboolean load_file(ObtParseInst *i,
     return r;
 }
 
+gboolean obt_parse_load_file(ObtParseInst *i,
+                             const gchar *path,
+                             const gchar *root_node)
+{
+    GSList *paths;
+    gboolean r;
+
+    paths = g_slist_append(NULL, g_strdup(path));
+
+    r = load_file(i, NULL, NULL, root_node, paths);
+
+    while (paths) {
+        g_free(paths->data);
+        paths = g_slist_delete_link(paths, paths);
+    }
+    return r;
+}
+
 gboolean obt_parse_load_config_file(ObtParseInst *i,
                                     const gchar *domain,
                                     const gchar *filename,
@@ -266,7 +299,7 @@ void obt_parse_tree(ObtParseInst *i, xmlNodePtr node)
 
     while (node) {
         struct Callback *c = g_hash_table_lookup(i->callbacks, node->name);
-        if (c) c->func(i, i->doc, node, c->data);
+        if (c) c->func(node, c->data);
         node = node->next;
     }
 }
@@ -415,7 +448,7 @@ static GSList* split_paths(const gchar *paths)
     return list;
 }
 
-void parse_paths_startup()
+void parse_paths_startup(void)
 {
     const gchar *path;
 
@@ -477,7 +510,7 @@ void parse_paths_startup()
                                         (GSListFunc) g_slist_prepend);
 }
 
-void parse_paths_shutdown()
+void parse_paths_shutdown(void)
 {
     GSList *it;
 
@@ -553,22 +586,22 @@ gboolean parse_mkdir_path(const gchar *path, gint mode)
     return ret;
 }
 
-const gchar* parse_xdg_config_home_path()
+const gchar* parse_xdg_config_home_path(void)
 {
     return xdg_config_home_path;
 }
 
-const gchar* parse_xdg_data_home_path()
+const gchar* parse_xdg_data_home_path(void)
 {
     return xdg_data_home_path;
 }
 
-GSList* parse_xdg_config_dir_paths()
+GSList* parse_xdg_config_dir_paths(void)
 {
     return xdg_config_dir_paths;
 }
 
-GSList* parse_xdg_data_dir_paths()
+GSList* parse_xdg_data_dir_paths(void)
 {
     return xdg_data_dir_paths;
 }
diff --git a/obt/parse.h b/obt/parse.h
index 09729a5a..3a541a0d 100644
--- a/obt/parse.h
+++ b/obt/parse.h
@@ -28,13 +28,15 @@ G_BEGIN_DECLS
 
 typedef struct _ObtParseInst ObtParseInst;
 
-typedef void (*ObtParseCallback)(ObtParseInst *i, xmlDocPtr doc,
-                                 xmlNodePtr node, gpointer data);
+typedef void (*ObtParseCallback)(xmlNodePtr node, gpointer data);
 
 ObtParseInst* obt_parse_instance_new();
 void obt_parse_instance_ref(ObtParseInst *inst);
 void obt_parse_instance_unref(ObtParseInst *inst);
 
+gboolean obt_parse_load_file(ObtParseInst *inst,
+                             const gchar *path,
+                             const gchar *root_node);
 gboolean obt_parse_load_config_file(ObtParseInst *inst,
                                     const gchar *domain,
                                     const gchar *filename,
@@ -51,6 +53,9 @@ gboolean obt_parse_load_theme_file(ObtParseInst *inst,
 gboolean obt_parse_load_mem(ObtParseInst *inst,
                             gpointer data, guint len, const gchar *root_node);
 
+xmlDocPtr obt_parse_instance_doc(ObtParseInst *inst);
+xmlNodePtr obt_parse_instance_root(ObtParseInst *inst);
+
 void obt_parse_close(ObtParseInst *inst);
 
 void obt_parse_register(ObtParseInst *inst, const gchar *tag,
@@ -60,7 +65,7 @@ void obt_parse_tree(ObtParseInst *i, xmlNodePtr node);
 
 /* helpers */
 
-xmlNodePtr obt_parse_find_node(xmlNodePtr node, const gchar *tag);
+xmlNodePtr obt_parse_find_node(xmlNodePtr node, const gchar *name);
 
 gboolean obt_parse_node_contains (xmlNodePtr node, const gchar *val);
 gchar   *obt_parse_node_string   (xmlNodePtr node);
diff --git a/obt/prop.c b/obt/prop.c
index bdbde53b..0a9131ad 100644
--- a/obt/prop.c
+++ b/obt/prop.c
@@ -410,12 +410,11 @@ void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
 
 void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val)
 {
-    const gchar *s[2] = { val, NULL };
+    gchar const *s[2] = { val, NULL };
     obt_prop_set_strings_locale(win, prop, s);
 }
 
-void obt_prop_set_strings_locale(Window win, Atom prop,
-                                 const gchar **strs)
+void obt_prop_set_strings_locale(Window win, Atom prop, gchar const **strs)
 {
     gint i, count;
     gchar **lstrs;
@@ -445,10 +444,10 @@ void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val)
                     PropModeReplace, (const guchar*)val, strlen(val));
 }
 
-void obt_prop_set_strings_utf8(Window win, Atom prop, const gchar **strs)
+void obt_prop_set_strings_utf8(Window win, Atom prop, gchar const **strs)
 {
     GString *str;
-    const gchar **s;
+    gchar const **s;
 
     str = g_string_sized_new(0);
     for (s = strs; *s; ++s) {
diff --git a/obt/prop.h b/obt/prop.h
index 1f570935..7dfa90f6 100644
--- a/obt/prop.h
+++ b/obt/prop.h
@@ -225,10 +225,8 @@ void obt_prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
                           guint num);
 void obt_prop_set_string_locale(Window win, Atom prop, const gchar *val);
 void obt_prop_set_string_utf8(Window win, Atom prop, const gchar *val);
-void obt_prop_set_strings_locale(Window win, Atom prop,
-                                 const gchar **strs);
-void obt_prop_set_strings_utf8(Window win, Atom prop,
-                               const gchar **strs);
+void obt_prop_set_strings_locale(Window win, Atom prop, gchar const **strs);
+void obt_prop_set_strings_utf8(Window win, Atom prop, gchar const **strs);
 
 void obt_prop_erase(Window win, Atom prop);