X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8ab9747e4a9942d928af6ccb9d6ead42ad5b13ea..90390240487da0045dac91f05098c59d0cc45981:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index 3ae854b..3141367 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,42 +143,20 @@ 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
+  ## Gnome session.
+  case "$vnc,$(gnome-session --version 2>&1)" in
+    no,gnome-session\ 2.3[2-9].* | \
+    no,gnome-session\ 2.4[0-9].* | \
+    no,gnome-session\ 2.[1-9][0-9][0-9]*)
+      run bginit gnome-session --session mdw
+      ;;
+    no,*)
+      run bginit gnome-session
       ;;
   esac
 
-  ## Panel.
-  case $vnc in no) run bginit gnome-panel ;; esac
-
   ## Local clients.
   start-clients-local
 }