--- gdm-2.8.0.4/config/Xsession.in.call-dbus-launch	2005-11-14 13:48:06.000000000 -0500
+++ gdm-2.8.0.4/config/Xsession.in	2005-11-14 13:56:38.000000000 -0500
@@ -227,14 +227,30 @@
 # add ssh-agent if found
 sshagent="`gdmwhich ssh-agent`"
 if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-    command="$sshagent -- $command"
-elif [ -z "$sshagent" ] ; then
-    echo "$0: ssh-agent not found!"
+    if [ "x$TMPDIR" != "x" ]; then
+        sshagent="$sshagent /bin/env TMPDIR=$TMPDIR"
+    fi
+else
+    if [ -z "$sshagent" ] ; then
+        echo "$0: ssh-agent not found!"
+    fi
+    sshagent=""
+fi
+
+# add dbus-launch if found
+dbuslaunch="`gdmwhich dbus-launch`"
+if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    dbuslaunch="/usr/bin/dbus-launch --exit-with-session"
+else
+    if [ -z "$dbuslaunch" ] ; then
+      echo "$0: dbuslaunch not found!"
+    fi
+    dbuslaunch=""
 fi
 
 echo "$0: Setup done, will execute: $command"
 
-eval exec $command
+eval exec $sshagent $dbuslaunch $command
 
 echo "$0: Executing $command failed, will run xterm"