From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 1 Apr 2010 08:49:10 +0000 (+0100)
Subject: dot/xinitrc: Run `gnome-screensaver' by preference.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/49aa87a27aa7f86f55a947c194c5d45559e76ecf?ds=inline;hp=--cc

dot/xinitrc: Run `gnome-screensaver' by preference.

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.
---

49aa87a27aa7f86f55a947c194c5d45559e76ecf
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