archrelease: copy trunk to community-any
[ArchLinux/community.git] / lxde-common / trunk / dbus-update-environment.patch
blobfda699a8abf1c22ee02dbeef7a46f85f5eb46f8d
1 diff -u -r lxde-common-0.99.0/startlxde.in lxde-common-0.99.0-dbus/startlxde.in
2 --- lxde-common-0.99.0/startlxde.in 2014-10-23 16:08:00.000000000 +0200
3 +++ lxde-common-0.99.0-dbus/startlxde.in 2015-09-25 19:00:01.152474183 +0200
4 @@ -34,10 +34,14 @@
5 export SAL_USE_VCLPLUGIN=gtk
7 # Launch DBus if needed
8 -if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
9 - if test -z "$XDG_RUNTIME_DIR" -o ! -S "$XDG_RUNTIME_DIR/bus" -o ! -O "$XDG_RUNTIME_DIR/bus"; then
10 - eval "$(dbus-launch --sh-syntax --exit-with-session)"
11 - fi
12 +if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
13 + if which dbus-launch >/dev/null; then
14 + eval "$(dbus-launch --sh-syntax --exit-with-session)"
15 + fi
16 +else
17 + if which dbus-update-activation-environment >/dev/null; then
18 + dbus-update-activation-environment --systemd --all
19 + fi
22 export XDG_MENU_PREFIX="lxde-"