From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 30 Mar 2010 09:02:20 +0000 (+0100)
Subject: Merge remote branch 'crybaby'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/107702fd093a77cdc73d8faa29b59b0b17f98d34?hp=c65b60f67a5175fcdc5e1435f79ffe2c9709a1c3

Merge remote branch 'crybaby'

* crybaby:
  dot/xinitrc: Start gnome-session(1).
---

diff --git a/dot/xinitrc b/dot/xinitrc
index f29eddd..cf54467 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -113,11 +113,11 @@ start-e16 () {
   run bginit $wm $wmopts
   win=nil
   for i in $(seq 10); do
+    sleep 1
     if eesh version >/dev/null 2>&1; then
       win=t
       break
     fi
-    sleep 1
   done
   case $win in
     t)
@@ -150,6 +150,10 @@ 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
@@ -168,9 +172,6 @@ start-clients () {
   ## Panel.
   case $vnc in no) run bginit gnome-panel ;; esac
 
-  ## System tray.
-  ## run bginit stalonetray
-
   ## Local clients.
   start-clients-local
 }