X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=63b74b9520aae55962c5b17ee342022920d3f89b;hb=c8ef10a0e1d8b75a8ae6027383a5081a9a1b0ea0;hp=a78aa4da015d944e628bb2edeba187e36fe858ec;hpb=2e8c9a13d4e188b538b14bd9a9d9cf31809400ed;p=chaz%2Fopenbox diff --git a/openbox/menu.c b/openbox/menu.c index a78aa4da..63b74b95 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -35,6 +35,7 @@ #include "client_list_combined_menu.h" #include "gettext.h" #include "obt/parse.h" +#include "obt/paths.h" typedef struct _ObMenuParseState ObMenuParseState; @@ -314,7 +315,7 @@ static void parse_menu(xmlNodePtr node, gpointer data) 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; @@ -499,6 +500,7 @@ void menu_entry_unref(ObMenuEntry *self) if (self && --self->ref == 0) { switch (self->type) { case OB_MENU_ENTRY_TYPE_NORMAL: + RrImageUnref(self->data.normal.icon); g_free(self->data.normal.label); while (self->data.normal.actions) { actions_act_unref(self->data.normal.actions->data);