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@.
This commit is contained in:
matthieu 2012-08-04 20:41:42 +00:00
parent 3929020b98
commit 31da0ff76b
2 changed files with 11 additions and 2 deletions

View File

@ -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

View File

@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
XCOMM $OpenBSD: xinitrc.cpp,v 1.6 2011/03/19 15:40:02 matthieu Exp $
XCOMM $OpenBSD: xinitrc.cpp,v 1.7 2012/08/04 20:41:42 matthieu Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@ -51,6 +51,11 @@ then
ssh-add < /dev/null
fi
XCOMM if dbus is installed, start its daemon
if test -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 &