summaryrefslogtreecommitdiff
path: root/obt/parse.h
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-07-27 01:37:28 -0400
committerDana Jansens <danakj@orodu.net>2008-01-20 01:36:55 -0500
commitfdabb69f4f25596df972caa76c85c2aeba26226e (patch)
tree2566f1a229a65e54cdffd88a255301d0bf7fa3a7 /obt/parse.h
parent0667bbc3e2fbd3fa39206e843560735524840d35 (diff)
update openbox to use the current parser interface in libobt
there is also some random bug fixes for other libobt stuff in here.
Diffstat (limited to 'obt/parse.h')
-rw-r--r--obt/parse.h11
1 files changed, 8 insertions, 3 deletions
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);