#include "client_list_combined_menu.h"
#include "gettext.h"
#include "obt/parse.h"
+#include "obt/paths.h"
typedef struct _ObMenuParseState ObMenuParseState;
"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'"),
"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'"),
void menu_pipe_execute(ObMenu *self)
{
- xmlNodePtr node;
gchar *output;
GError *err = NULL;
{
menu_parse_state.pipe_creator = self;
menu_parse_state.parent = self;
- obt_parse_tree(menu_parse_inst, node->children);
+ obt_parse_tree_from_root(menu_parse_inst);
obt_parse_close(menu_parse_inst);
} else {
g_message(_("Invalid output from pipe-menu '%s'"), self->execute);
if ((menu = menu_new(name, title, TRUE, NULL))) {
menu->pipe_creator = state->pipe_creator;
if (obt_parse_attr_string(node, "execute", &script)) {
- menu->execute = parse_expand_tilde(script);
+ menu->execute = obt_paths_expand_tilde(script);
} else {
ObMenu *old;