From 49aa87a27aa7f86f55a947c194c5d45559e76ecf Mon Sep 17 00:00:00 2001 Message-Id: <49aa87a27aa7f86f55a947c194c5d45559e76ecf.1717317742.git.mdw@distorted.org.uk> From: Mark Wooding Date: Thu, 1 Apr 2010 09:49:10 +0100 Subject: [PATCH] dot/xinitrc: Run `gnome-screensaver' by preference. Organization: Straylight/Edgeware From: Mark Wooding Now that we've got gnome-session running, there's no reason not to any more. And it also does the right thing with the keyring system. --- dot/xinitrc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dot/xinitrc b/dot/xinitrc index cf54467..3d337a6 100755 --- a/dot/xinitrc +++ b/dot/xinitrc @@ -146,6 +146,16 @@ start-window-manager () { start-clients-local () { :; } +scsv=$(pick_program screensaver gnome-screensaver xscreensaver) +case $scsv in + xscreensaver) + scsvopts="-no-splash" + ;; + *) + scsvopts="" + ;; +esac + start-clients () { ## Mail notification. run bginit mail-notification @@ -165,7 +175,7 @@ start-clients () { case $vnc in no) run init xscreensaver-command -exit - run bginit xscreensaver -no-splash + run bginit $scsv $scsvopts ;; esac -- [mdw]