X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/27b6787d466dad36ec9b06cc1fa86c6e646e5350..8ca91005bcad285426003ddbd2c3f1553ab21b90:/dot/xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index 80c2a14..4f69187 100755
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -105,7 +105,7 @@ initialize () {
 ###--------------------------------------------------------------------------
 ### Start a window manager.
 
-wm=$(pick_program window-manager enlightenment e16 twm)
+wm=$(pick_program window-manager e16 compiz enlightenment e17 twm)
 wmopts=""
 case "$wm,$vnc" in
   enlightenment,yes | e16,yes)
@@ -327,6 +327,28 @@ EOF
 }
 
 ###--------------------------------------------------------------------------
+### Gnome session care and feeding.
+
+session-running-p () {
+  dbus-send --session --print-reply --dest=org.freedesktop.DBus / \
+    org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager \
+    >/dev/null 2>&1
+}
+
+kill-gnome-session () {
+  if session-running-p; then
+    info "killing Gnome session manager"
+    dbus-send --session \
+      --dest=org.gnome.SessionManager /org/gnome/SessionManager \
+      org.gnome.SessionManager.Logout uint32:2
+    for i in 1 2 3 4 5; do
+      sleep 1
+      if ! session-running-p; then break; fi
+    done
+  fi
+}
+
+###--------------------------------------------------------------------------
 ### Actually start things up.
 
 if [ -f $HOME/.xinitrc-local ]; then
@@ -350,6 +372,7 @@ esac
 case "$wait" in
   yes)
     xwait
+    kill-gnome-session
     ;;
   no)
     info "not waiting before exit"