summaryrefslogtreecommitdiff
path: root/app/xinit/xinitrc.cpp
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2015-10-17 08:25:12 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2015-10-17 08:25:12 +0000
commit6276e7260cbbecac70f89242cdec4f09caa55f1f (patch)
treeda516ec741ecf11179661ef78115c76181d239bb /app/xinit/xinitrc.cpp
parent33978d08ea305c896741d052aa181253af43f4aa (diff)
Don't automatically launch dbus as part of the default user sessions.
requested by deraadt@ no objection ajacoutot@
Diffstat (limited to 'app/xinit/xinitrc.cpp')
-rw-r--r--app/xinit/xinitrc.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/xinit/xinitrc.cpp b/app/xinit/xinitrc.cpp
index 1bcfd96a3..4c9c3ae8a 100644
--- a/app/xinit/xinitrc.cpp
+++ b/app/xinit/xinitrc.cpp
@@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
-XCOMM $OpenBSD: xinitrc.cpp,v 1.12 2014/02/26 14:21:28 matthieu Exp $
+XCOMM $OpenBSD: xinitrc.cpp,v 1.13 2015/10/17 08:25:11 matthieu Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -56,11 +56,6 @@ then
fi
fi
-XCOMM if dbus is installed, start its daemon
-if [ -x /usr/local/bin/dbus-launch -a -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
- eval `dbus-launch --sh-syntax --exit-with-session`
-fi
-
XCOMM start some nice programs
XCLOCK -geometry 50x50-1+1 &