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

@@ -304,6 +304,11 @@ node = node->next;
     }
 }
 
+void obt_parse_tree_from_root(ObtParseInst *i)
+{
+    obt_parse_tree(i, i->root->children);
+}
+
 gchar *obt_parse_node_string(xmlNodePtr node)
 {
     xmlChar *c = xmlNodeGetContent(node);

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

@@ -61,6 +61,7 @@ 
 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 */

M openbox/menu.c → openbox/menu.c

@@ -94,8 +94,7 @@ it->data,
                                        "openbox_menu"))
         {
             loaded = TRUE;
-            obt_parse_tree(menu_parse_inst,
-                           obt_parse_instance_root(menu_parse_inst)->children);
+            obt_parse_tree_from_root(menu_parse_inst);
             obt_parse_close(menu_parse_inst);
         } else
             g_message(_("Unable to find a valid menu file '%s'"),
@@ -107,8 +106,7 @@ "openbox",
                                        "menu.xml",
                                        "openbox_menu"))
         {
-            obt_parse_tree(menu_parse_inst,
-                           obt_parse_instance_root(menu_parse_inst)->children);
+            obt_parse_tree_from_root(menu_parse_inst);
             obt_parse_close(menu_parse_inst);
         } else
             g_message(_("Unable to find a valid menu file '%s'"),

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

@@ -230,7 +230,7 @@ /* parse/load user options */
                 if (obt_parse_load_config_file(i, "openbox", "rc.xml",
                                                "openbox_config"))
                 {
-                    obt_parse_tree(i, obt_parse_instance_root(i)->children);
+                    obt_parse_tree_from_root(i);
                     obt_parse_close(i);
                 } else
                     g_message(_("Unable to find a valid config file, using some simple defaults"));