From 839cbee7197123f584b4674c370ba2c0c1b6e196 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sun, 5 Jun 2016 16:10:46 +0300 Subject: [PATCH] When locking fallback to xflock4 first (Bug #12603) While it would be nice to use the xdg-screensaver first since it is the standard, it breaks the existing workflow for users who have custom patches in xflock4 so switch back to the previous fallback order. --- src/xfce-screensaver.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/xfce-screensaver.c b/src/xfce-screensaver.c index b315b42..594aec9 100644 --- a/src/xfce-screensaver.c +++ b/src/xfce-screensaver.c @@ -544,14 +544,12 @@ xfce_screensaver_lock (XfceScreenSaver *saver) "Please set the xfconf property %s%s in xfce4-session to the desired lock command", XFSM_PROPERTIES_PREFIX, LOCK_COMMAND); - /* Fall back to trying a couple others, using the xdg standard - * one first */ - ret = g_spawn_command_line_async ("xdg-screensaver lock", NULL); + ret = g_spawn_command_line_async ("xflock4", NULL); } if (!ret) { - ret = g_spawn_command_line_async ("xflock4", NULL); + ret = g_spawn_command_line_async ("xdg-screensaver lock", NULL); } if (!ret) -- 2.8.3