[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: When locking fallback to xflock4 first (Bug #12603)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 7e8574c188893eb2a73cf9d51765822089010dd5
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Jun 5 16:10:46 2016 +0300

    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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.