From 5587cf4f528512164052d11e12196416a490e30e Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 12 Apr 2010 21:01:14 +0100
Subject: [PATCH] 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.
---
 dot/xinitrc | 39 ++-------------------------------------
 1 file changed, 2 insertions(+), 37 deletions(-)

diff --git a/dot/xinitrc b/dot/xinitrc
index 3d337a6..750bc9e 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -93,9 +93,6 @@ initialize () {
 
   ## 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 () { :; }
 
-scsv=$(pick_program screensaver gnome-screensaver xscreensaver)
-case $scsv in
-  xscreensaver)
-    scsvopts="-no-splash"
-    ;;
-  *)
-    scsvopts=""
-    ;;
-esac
-
 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
-- 
2.11.0