diff options
| author | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-05-03 05:57:06 +0000 |
|---|---|---|
| committer | Antoine Jacoutot <ajacoutot@cvs.openbsd.org> | 2013-05-03 05:57:06 +0000 |
| commit | a3307478076bafc873e7acbfe5368cd706eea65e (patch) | |
| tree | 241c8ea335b964e2de105baad32a063d4515a2c8 /app/xdm | |
| parent | b461ef67e2ae52bae82057ccd2a46af048612b8a (diff) | |
Start dbus-launch in a consistent way int xinitrc and Xsession and fix
an indent weirdness while here.
ok matthieu@
Diffstat (limited to 'app/xdm')
| -rw-r--r-- | app/xdm/config/Xsession.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/xdm/config/Xsession.cpp b/app/xdm/config/Xsession.cpp index a22a849f6..046d60b78 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.10 2012/08/04 20:41:42 matthieu Exp $ +XCOMM $OpenBSD: Xsession.cpp,v 1.11 2013/05/03 05:57:05 ajacoutot Exp $ XCOMM redirect errors to a file in user's home directory if we can @@ -101,8 +101,7 @@ else exec `eval $XDESKTOP` } #endif - if [ -x /usr/local/bin/dbus-launch \ - -a -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then + 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 & |