summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-07-28 10:56:21 -0400
committerDana Jansens <danakj@orodu.net>2008-01-20 01:36:55 -0500
commit1a0a1626b699c2e272ea6823b59aa7387242880e (patch)
tree87b51771335a06ae6a4a5983c450c169bb9aa268
parent2e8c9a13d4e188b538b14bd9a9d9cf31809400ed (diff)
small api change for parsing
-rw-r--r--obt/parse.c4
-rw-r--r--obt/parse.h4
-rw-r--r--openbox/session.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/obt/parse.c b/obt/parse.c
index 741b19e1..f23ed194 100644
--- a/obt/parse.c
+++ b/obt/parse.c
@@ -87,13 +87,13 @@ void obt_parse_instance_unref(ObtParseInst *i)
}
}
-xmlDocPtr obt_parse_instance_doc(ObtParseInst *i)
+xmlDocPtr obt_parse_doc(ObtParseInst *i)
{
g_assert(i->doc); /* a doc is open? */
return i->doc;
}
-xmlNodePtr obt_parse_instance_root(ObtParseInst *i)
+xmlNodePtr obt_parse_root(ObtParseInst *i)
{
g_assert(i->doc); /* a doc is open? */
return i->root;
diff --git a/obt/parse.h b/obt/parse.h
index cba7c495..5836df0f 100644
--- a/obt/parse.h
+++ b/obt/parse.h
@@ -53,8 +53,8 @@ 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);
+xmlDocPtr obt_parse_doc(ObtParseInst *inst);
+xmlNodePtr obt_parse_root(ObtParseInst *inst);
void obt_parse_close(ObtParseInst *inst);
diff --git a/openbox/session.c b/openbox/session.c
index 22b47e78..e6883f32 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -661,7 +661,7 @@ static void session_load_file(const gchar *path)
obt_parse_instance_unref(i);
return;
}
- node = obt_parse_instance_root(i);
+ node = obt_parse_root(i);
if ((n = obt_parse_find_node(node->children, "desktop")))
session_desktop = obt_parse_node_int(n);