dot/xinitrc: Punt a bunch of application startup stuff to `gnome-session'.

Realization: if I let it do its thing, I have less work to do.  It knows
more about funny infrastructural stuff than I do, and things like
`gkrellm' might not be installed everywhere.

diff --git a/dot/xinitrc b/dot/xinitrc
index 3d337a6a2cd33298a93e7e4c2869b05034f9ddf0..750bc9e29c8ced6e897f11ee37de968ded15905a 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -93,9 +93,6 @@ initialize () {
 
   ## Key mappings.
   xmodmap -e 'keysym BackSpace = BackSpace BackSpace'
 
   ## Key mappings.
   xmodmap -e 'keysym BackSpace = BackSpace BackSpace'

-
-  ## Gnome settings.
-  case $vnc in no) run bginit gnome-settings-daemon ;; esac

 }
 
 ###--------------------------------------------------------------------------
 }
 
 ###--------------------------------------------------------------------------


@@ -146,41 +143,9 @@ 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 () {
 start-clients () {

-  ## Mail notification.
-  run bginit mail-notification
-
-  ## Gnome session.  With great reluctance.  At least it doesn't actually do
-  ## anything.
-  run bginit gnome-session
-
-  ## Policykit authentication agent.
-  agent=/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
-  if [ -x $agent ]; then run bginit $agent; fi
-
-  ## System monitor.
-  case $vnc in no) run bginit gkrellm ;; esac
-
-  ## Screensaver.
-  case $vnc in
-    no)
-      run init xscreensaver-command -exit
-      run bginit $scsv $scsvopts
-      ;;
-  esac
-
-  ## Panel.
-  case $vnc in no) run bginit gnome-panel ;; esac
+  ## Gnome session.
+  case $vnc in no) run bginit gnome-session ;; esac

 
   ## Local clients.
   start-clients-local
 
   ## Local clients.
   start-clients-local