From ec2de2b7d2550c80d56bae8a8e16c353ddfb7381 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@ncipher.com>
Date: Wed, 29 Mar 2006 15:08:52 +0100
Subject: [PATCH] xinitrc: Switch based on VNC-ness rather than lots of feature
 flags.

This seems more maintainable in the long run.
---
 vncsession | 2 +-
 xinitrc    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/vncsession b/vncsession
index e16bcb2..3e4d0fb 100755
--- a/vncsession
+++ b/vncsession
@@ -8,7 +8,7 @@ set -vx
 __mdw_force_secure_session=yes
 . $HOME/.bash_profile
 EOPTS="-econfdir $HOME/.enlightenment-vnc"
-SCSAVE=false
+VNCSESSION=true
 xmodmap -e 'keysym Alt_L = Meta_L'
 xmodmap -e 'keysym Alt_R = Meta_R'
 . $HOME/.xinitrc
diff --git a/xinitrc b/xinitrc
index 17471fe..4e52f4b 100755
--- a/xinitrc
+++ b/xinitrc
@@ -1,6 +1,7 @@
 #! /bin/bash
 
 xrdb -override $HOME/.Xdefaults
+: ${VNCSESSION=false}
 export __mdw_sechost="`hostname`"
 
 # --- Do some fiddling ---
@@ -11,7 +12,7 @@ xset r rate 500 50
 xset m 1 1
 gnome-settings-daemon&
 mail-notification&
-gkrellm&
+$VNCSESSION || gkrellm&
 eval `xscsize -bx`
 
 # --- Crank up ESD ---
@@ -27,12 +28,11 @@ enlightenment $EOPTS&
 
 # --- Crank up a screenlock program ---
 
-if ${SCSAVE-true}; then
+if ! $VNCSESSION; then
   xscreensaver-command -exit
   xscreensaver -no-splash&
 fi
 gnome-panel&
-mail-notification&
 
 # --- Emacs window measurements ---
 #
-- 
2.11.0