X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=obt%2Fparse.h;h=acc3f5c6cc3ed5bfcff1de0139664d86cfb5c852;hb=a170ad7c85b5f23fafe64d28a3f183a7ce42ce53;hp=09729a5a19accb2dc235b2a1446e8b843f0eb838;hpb=0667bbc3e2fbd3fa39206e843560735524840d35;p=chaz%2Fopenbox

diff --git a/obt/parse.h b/obt/parse.h
index 09729a5a..acc3f5c6 100644
--- a/obt/parse.h
+++ b/obt/parse.h
@@ -19,8 +19,6 @@
 #ifndef __obt_parse_h
 #define __obt_parse_h
 
-#include "version.h"
-
 #include <libxml/parser.h>
 #include <glib.h>
 
@@ -28,13 +26,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();
+ObtParseInst* obt_parse_instance_new(void);
 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,16 +51,20 @@ 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_doc(ObtParseInst *inst);
+xmlNodePtr obt_parse_root(ObtParseInst *inst);
+
 void obt_parse_close(ObtParseInst *inst);
 
 void obt_parse_register(ObtParseInst *inst, const gchar *tag,
                         ObtParseCallback func, gpointer data);
 void obt_parse_tree(ObtParseInst *i, xmlNodePtr node);
+void obt_parse_tree_from_root(ObtParseInst *i);
 
 
 /* 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);
@@ -76,24 +80,6 @@ gboolean obt_parse_attr_int      (xmlNodePtr node, const gchar *name,
 gboolean obt_parse_attr_bool     (xmlNodePtr node, const gchar *name,
                                   gboolean *value);
 
-/* paths */
-
-void parse_paths_startup();
-void parse_paths_shutdown();
-
-const gchar* parse_xdg_config_home_path();
-const gchar* parse_xdg_data_home_path();
-GSList* parse_xdg_config_dir_paths();
-GSList* parse_xdg_data_dir_paths();
-
-/*! Expands the ~ character to the home directory throughout the given
-  string */
-gchar *parse_expand_tilde(const gchar *f);
-/*! Makes a directory */
-gboolean parse_mkdir(const gchar *path, gint mode);
-/*! Makes a directory and all its parents */
-gboolean parse_mkdir_path(const gchar *path, gint mode);
-
 G_END_DECLS
 
 #endif