Merge remote-tracking branch 'crybaby'

[profile] / dot / xinitrc

diff --git a/dot/xinitrc b/dot/xinitrc
index 9c158bb327f0e1cc1a1c279597ccfb36b2f52ac9..8fce589db011b56d1213649c07b13c3b44b79d24 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -151,8 +151,18 @@ start-window-manager () {
 start-clients-local () { :; }
 
 start-clients () {
+
   ## Gnome session.
-  case $vnc in no) run bginit gnome-session ;; esac
+  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
 
   ## Local clients.
   start-clients-local
@@ -326,6 +336,28 @@ EOF
   done
 }
 
+###--------------------------------------------------------------------------
+### 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.
 
@@ -350,6 +382,7 @@ esac
 case "$wait" in
   yes)
     xwait
+    kill-gnome-session
     ;;
   no)
     info "not waiting before exit"