small api change for parsing

diff --git a/obt/parse.c b/obt/parse.c
index 741b19e..f23ed19 100644 (file)
--- 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 cba7c49..5836df0 100644 (file)
--- 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 22b47e7..e6883f3 100644 (file)
--- 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);