[Xfce4-commits] <xfce4-settings:nick/xsettingsd-merge> Show error dialog is shortcut failed.

[Nick Schermer]

Updating branch refs/heads/nick/xsettingsd-merge
         to a89d076ad710bd944f67be92c509bfc41a0218aa (commit)
       from 34f4011337ea899b34caa5111d92bbfd44439bad (commit)

commit a89d076ad710bd944f67be92c509bfc41a0218aa
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);
     }