static gboolean run_func(ObActionsData *data, gpointer options);
-static void prompt_cb(ObPrompt *p, gint result, gpointer options)
+static gboolean prompt_cb(ObPrompt *p, gint result, gpointer options)
{
if (result)
run_func(NULL, options);
+ return TRUE; /* call the cleanup func */
+}
+static void prompt_cleanup(ObPrompt *p, gpointer options)
+{
prompt_unref(p);
free_func(options);
}
/* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options)
{
- GError *e = NULL;
+ GError *e;
gchar **argv = NULL;
gchar *cmd;
Options *o = options;
};
ocp = dup_options(options);
- p = prompt_new(o->prompt, answers, 2, 0, 0, prompt_cb, ocp);
+ p = prompt_new(o->prompt, _("Execute"), answers, 2, 0, 0,
+ prompt_cb, prompt_cleanup, ocp);
prompt_show(p, NULL, FALSE);
return FALSE;
if (data->client) {
gchar *c, *before, *expand;
- /* replace occurances of $pid and $window */
+ /* replace occurrences of $pid and $wid */
expand = NULL;
before = cmd;
before = c + 4; /* 4 = strlen("$pid") */
}
-
- if ((c[1] == 'w' || c[1] == 'W') &&
+ else if ((c[1] == 'w' || c[1] == 'W') &&
(c[2] == 'i' || c[2] == 'I') &&
- (c[3] == 'n' || c[3] == 'N') &&
- (c[4] == 'd' || c[4] == 'D') &&
- (c[5] == 'o' || c[5] == 'O') &&
- (c[6] == 'w' || c[6] == 'W') &&
- !g_ascii_isalnum(c[7]))
+ (c[3] == 'd' || c[3] == 'D') &&
+ !g_ascii_isalnum(c[4]))
{
- /* found $window */
+ /* found $wid */
gchar *tmp;
*c = '\0';
data->client->window);
g_free(tmp);
- before = c + 7; /* 4 = strlen("$window") */
+ before = c + 4; /* 4 = strlen("$wid") */
}
+ else
+ before = c + 1; /* no infinite loops plz */
}
if (expand) {
it so the application can grab things */
event_cancel_all_key_grabs();
+ e = NULL;
if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
- g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
+ g_message(e->message, o->cmd);
g_error_free(e);
}
else {
gchar *program = NULL;
+ gboolean ok;
if (o->sn) {
program = g_path_get_basename(argv[0]);
screen_desktop);
}
- if (!g_spawn_async(NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
- NULL, NULL, NULL, &e))
- {
- g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
+ e = NULL;
+ ok = g_spawn_async(NULL, argv, NULL,
+ G_SPAWN_SEARCH_PATH |
+ G_SPAWN_DO_NOT_REAP_CHILD,
+ NULL, NULL, NULL, &e);
+ if (!ok) {
+ g_message(e->message, o->cmd);
g_error_free(e);
-
- if (o->sn)
- sn_spawn_cancel();
}
- if (o->sn)
+
+ if (o->sn) {
+ if (!ok) sn_spawn_cancel();
unsetenv("DESKTOP_STARTUP_ID");
+ }
g_free(program);
g_strfreev(argv);