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

noreply at xfce.org noreply at xfce.org
Mon Jun 6 04:57:29 CEST 2016


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

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

commit affe4d948da63b9c11553d295bddf2867f797ad2
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Jun 6 05:56:57 2016 +0300

    When locking fallback to xflock4 first (Bug #12603)
---
 xfce4-session/xfce-screensaver.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/xfce4-session/xfce-screensaver.c b/xfce4-session/xfce-screensaver.c
index b866b4f..594aec9 100644
--- a/xfce4-session/xfce-screensaver.c
+++ b/xfce4-session/xfce-screensaver.c
@@ -542,16 +542,14 @@ xfce_screensaver_lock (XfceScreenSaver *saver)
             {
                 g_warning ("Screensaver lock command not set when attempting to lock the screen.\n"
                            "Please set the xfconf property %s%s in xfce4-session to the desired lock command",
-                            XFSM_PROPERTIES_PREFIX, 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.


More information about the Xfce4-commits mailing list