[Xfce4-commits] <xfce4-settings:master> Show error dialog is shortcut failed.
Nick Schermer
noreply at xfce.org
Mon Feb 28 17:16:15 CET 2011
Updating branch refs/heads/master
to 5917441f2e73a24dc9a1d747c97baccbcad3ab6d (commit)
from 2cd7e60c47b681c00aedf548e837dfd9c3a44059 (commit)
commit 5917441f2e73a24dc9a1d747c97baccbcad3ab6d
Author: Nick Schermer <nick at xfce.org>
Date: Wed Feb 23 22:44:00 2011 +0100
Show error dialog is shortcut failed.
Better to show a warning instead of leaving the user
clueless why nothing happend.
Also use xfce_spawn_on_screen, easier on the eyes.
xfsettingsd/keyboard-shortcuts.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/xfsettingsd/keyboard-shortcuts.c b/xfsettingsd/keyboard-shortcuts.c
index 6b0d229..b77d91d 100644
--- a/xfsettingsd/keyboard-shortcuts.c
+++ b/xfsettingsd/keyboard-shortcuts.c
@@ -234,17 +234,16 @@ xfce_keyboard_shortcuts_helper_shortcut_activated (XfceShortcutsGrabber *
succeed = g_shell_parse_argv (sc->command, NULL, &argv, &error);
if (G_LIKELY (succeed))
{
- succeed = xfce_spawn_on_screen_with_child_watch (xfce_gdk_screen_get_active (NULL),
- NULL, argv, NULL,
- G_SPAWN_SEARCH_PATH, sc->snotify,
- timestamp, NULL, NULL, &error);
+ succeed = xfce_spawn_on_screen (xfce_gdk_screen_get_active (NULL),
+ NULL, argv, NULL, G_SPAWN_SEARCH_PATH,
+ sc->snotify, timestamp, NULL, &error);
g_strfreev (argv);
}
if (!succeed)
{
- g_error ("Failed to spawn command \"%s\": %s", sc->command, error->message);
+ xfce_dialog_show_error (NULL, error, _("Failed to launch shortcut \"%s\""), shortcut);
g_error_free (error);
}
More information about the Xfce4-commits
mailing list