X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=adfa2d9e6c8957caddbcc58d0d9e838fbe3b02f6;hb=46d99fbaff396d7b596ece772a6349753c11a135;hp=efc7f1ef513b89dba2bac42d9fb692e2ef2e3556;hpb=8fe0cb8989c1fe12b30b9030b446345f25340d35;p=chaz%2Fopenbox diff --git a/openbox/action.c b/openbox/action.c index efc7f1ef..adfa2d9e 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -723,7 +723,7 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if (act->func == action_execute || act->func == action_restart) { if ((n = parse_find_node("execute", node->xmlChildrenNode))) { gchar *s = parse_string(doc, n); - act->data.execute.path = ob_expand_tilde(s); + act->data.execute.path = parse_expand_tilde(s); g_free(s); } } else if (act->func == action_showmenu) { @@ -800,6 +800,7 @@ void action_execute(union ActionData *data) g_warning("failed to execute '%s': %s", cmd, e->message); } + g_free(cmd); } else { g_warning("failed to convert '%s' from utf8", data->execute.path); } @@ -1231,11 +1232,12 @@ void action_growtoedge(union ActionData *data) { int x, y, width, height, dest; ObClient *c = data->diraction.any.c; - Rect *a = screen_area(c->desktop); + Rect *a; if (!c) return; + a = screen_area(c->desktop); x = c->frame->area.x; y = c->frame->area.y; width = c->frame->area.width;