+/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
+
+ action.c for the Openbox window manager
+ Copyright (c) 2003 Ben Jansens
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ See the COPYING file for a copy of the GNU General Public License.
+*/
+
#include "debug.h"
#include "client.h"
#include "focus.h"
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) {
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);
}
void action_exit(union ActionData *data)
{
- ob_exit();
+ ob_exit(0);
}
void action_showmenu(union ActionData *data)
if (!c)
return;
- a = = screen_area(c->desktop);
+ a = screen_area(c->desktop);
x = c->frame->area.x;
y = c->frame->area.y;
width = c->frame->area.width;