nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move some code around in the execute action

Browse source
This commit is contained in:
Dana Jansens 2008-03-01 01:21:55 -05:00
parent 94d41260a0
commit 26cd4d19d4
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
openbox/actions/execute.c
View file

@ -108,7 +108,7 @@ static void prompt_cb(ObPrompt *p, gint result, gpointer options)
/* Always return FALSE because its not interactive */ /* Always return FALSE because its not interactive */
static gboolean run_func(ObActionsData *data, gpointer options) static gboolean run_func(ObActionsData *data, gpointer options)
{ {
GError *e = NULL; GError *e;
gchar **argv = NULL; gchar **argv = NULL;
gchar *cmd; gchar *cmd;
Options *o = options; Options *o = options;
@ -205,12 +205,14 @@ static gboolean run_func(ObActionsData *data, gpointer options)
it so the application can grab things */ it so the application can grab things */
event_cancel_all_key_grabs(); event_cancel_all_key_grabs();
e = NULL;
if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) { if (!g_shell_parse_argv(cmd, NULL, &argv, &e)) {
g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message); g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message);
g_error_free(e); g_error_free(e);
} }
else { else {
gchar *program = NULL; gchar *program = NULL;
gboolean ok;
if (o->sn) { if (o->sn) {
program = g_path_get_basename(argv[0]); program = g_path_get_basename(argv[0]);
@ -221,18 +223,21 @@ static gboolean run_func(ObActionsData *data, gpointer options)
screen_desktop); screen_desktop);
} }
if (!g_spawn_async(NULL, argv, NULL, e = NULL;
G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ok = g_spawn_async(NULL, argv, NULL,
NULL, NULL, NULL, &e)) G_SPAWN_SEARCH_PATH |
{ G_SPAWN_DO_NOT_REAP_CHILD,
g_message(_("Failed to execute \"%s\": %s"), o->cmd, e->message); NULL, NULL, NULL, &e);
if (!ok) {
g_message(_("Failed to execute \"%s\": %s"),
o->cmd, e->message);
g_error_free(e); 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"); unsetenv("DESKTOP_STARTUP_ID");
}
g_free(program); g_free(program);
g_strfreev(argv); g_strfreev(argv);