M obt/parse.c → obt/parse.c

@@ -87,13 +87,13 @@ g_free(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;

M obt/parse.h → obt/parse.h

@@ -53,8 +53,8 @@ const gchar *root_node);
 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);
 

M openbox/session.c → openbox/session.c

@@ -661,7 +661,7 @@ if (!obt_parse_load_file(i, path, "openbox_session")) {
         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);