summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
Diffstat (limited to 'openbox')
-rw-r--r--openbox/menu.c6
-rw-r--r--openbox/openbox.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/openbox/menu.c b/openbox/menu.c
index 97af104e..f6d19d01 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -94,8 +94,7 @@ void menu_startup(gboolean reconfig)
"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 @@ void menu_startup(gboolean reconfig)
"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'"),
diff --git a/openbox/openbox.c b/openbox/openbox.c
index 2cab7e27..92d0bbf6 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -230,7 +230,7 @@ gint main(gint argc, gchar **argv)
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"));