diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-02-15 20:10:09 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-02-15 20:10:09 +0000 |
| commit | 81d9c5cffa508e424168cac064a205927ec76366 (patch) | |
| tree | 98c898b6f3acf3540193dd28af7628a0e7d2caab /config | |
| parent | 4068f04d468b81d12bca253add088c471133d095 (diff) | |
| download | gdm-81d9c5cffa508e424168cac064a205927ec76366.tar.gz | |
Now start dbus-launch in GDM's Xsession script if dbus-launch is available
2006-02-13 Brian Cameron <brian.cameron@sun.com>
* config/Xsession.in: Now start dbus-launch in GDM's Xsession
script if dbus-launch is available on the system. Fixes
bug #331104. Patch provided by delgarde@ihug.co.nz.
Diffstat (limited to 'config')
| -rwxr-xr-x | config/Xsession.in | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/Xsession.in b/config/Xsession.in index 4b7cb5f9..64936656 100755 --- a/config/Xsession.in +++ b/config/Xsession.in @@ -225,6 +225,14 @@ if [ "x$command" = "xdefault" ] ; then fi fi +# add dbus-launch if found +dbuslaunch="`gdmwhich dbus-launch`" +if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + command="$dbuslaunch --exit-with-session $command" +elif [ -z "$dbuslaunch" ] ; then + echo "$0: dbus-launch not found!" +fi + # add ssh-agent if found sshagent="`gdmwhich ssh-agent`" if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then |