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.

diff --git a/dot/xinitrc b/dot/xinitrc
index cf544679ca79f3c70f79e8b10e5bbcd7cffa76b0..3d337a6a2cd33298a93e7e4c2869b05034f9ddf0 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -146,6 +146,16 @@ start-window-manager () {
 
 start-clients-local () { :; }
 
 
 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
 start-clients () {
   ## Mail notification.
   run bginit mail-notification


@@ -165,7 +175,7 @@ start-clients () {
   case $vnc in
     no)
       run init xscreensaver-command -exit
   case $vnc in
     no)
       run init xscreensaver-command -exit

-      run bginit xscreensaver -no-splash
+      run bginit $scsv $scsvopts

       ;;
   esac
 
       ;;
   esac