summaryrefslogtreecommitdiffstats
path: root/source/x/motif/xinitrc.mwm
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/x/motif/xinitrc.mwm (renamed from source/kde/post-install/kde-workspace/xinit/xinitrc.kde)13
1 files changed, 7 insertions, 6 deletions
diff --git a/source/kde/post-install/kde-workspace/xinit/xinitrc.kde b/source/x/motif/xinitrc.mwm
index a33eb06cf..00de7396b 100644
--- a/source/kde/post-install/kde-workspace/xinit/xinitrc.kde
+++ b/source/x/motif/xinitrc.mwm
@@ -1,5 +1,4 @@
#!/bin/sh
-# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -24,9 +23,11 @@ if [ -f $usermodmap ]; then
xmodmap $usermodmap
fi
-# Start the window manager:
-if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
- ck-launch-session startkde
-else
- startkde
+# Start DBUS session bus:
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+ eval $(dbus-launch --sh-syntax --exit-with-session)
fi
+
+# Start the window manager:
+exec /usr/bin/mwm
+