summaryrefslogtreecommitdiff
path: root/app/xdm/config
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2012-08-04 20:41:43 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2012-08-04 20:41:43 +0000
commit6248002cedd900967ceaeafc7e587c864e0aa01c (patch)
treeb0c3904b758050d80bdd18d0d4f8adaa5b4e31ba /app/xdm/config
parent3ca201b3f1d8839b399b35945b1d2f3063636b25 (diff)
If dbus is installed, start the daemon as part of the X session.
That will help applications that depend on dbus beeing started. With ajacoutot@.
Diffstat (limited to 'app/xdm/config')
-rw-r--r--app/xdm/config/Xsession.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/xdm/config/Xsession.cpp b/app/xdm/config/Xsession.cpp
index a840cb4bb..a22a849f6 100644
--- a/app/xdm/config/Xsession.cpp
+++ b/app/xdm/config/Xsession.cpp
@@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
-XCOMM $OpenBSD: Xsession.cpp,v 1.9 2011/12/03 13:46:00 matthieu Exp $
+XCOMM $OpenBSD: Xsession.cpp,v 1.10 2012/08/04 20:41:42 matthieu Exp $
XCOMM redirect errors to a file in user's home directory if we can
@@ -101,6 +101,10 @@ else
exec `eval $XDESKTOP`
}
#endif
+ if [ -x /usr/local/bin/dbus-launch \
+ -a -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
+ eval `dbus-launch --sh-syntax --exit-with-session`
+ fi
BINDIR/xterm &
BINDIR/fvwm
fi