diff --speed-large-files --minimal -Nru xfce-utils-4.4.3.orig/scripts/xinitrc xfce-utils-4.4.3/scripts/xinitrc --- xfce-utils-4.4.3.orig/scripts/xinitrc 2008-10-26 23:52:06.000000000 +0100 +++ xfce-utils-4.4.3/scripts/xinitrc 2008-10-28 22:56:38.818764000 +0100 @@ -72,12 +72,14 @@ fi # Use dbus-launch if installed. -if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then - dbuslaunch=`which dbus-launch` - if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then - eval `$dbuslaunch --sh-syntax --exit-with-session` - fi -fi +dbuslaunch=`which dbus-launch` +case "x$dbuslaunch" in + x|xno*) + ;; + *) + $dbuslaunch --sh-syntax --exit-with-session + ;; +esac # Run xfce4-session if installed xfcesm=`which xfce4-session` diff --speed-large-files --minimal -Nru xfce-utils-4.4.3.orig/scripts/xinitrc.in xfce-utils-4.4.3/scripts/xinitrc.in --- xfce-utils-4.4.3.orig/scripts/xinitrc.in 2008-10-26 23:04:16.000000000 +0100 +++ xfce-utils-4.4.3/scripts/xinitrc.in 2008-10-28 22:56:51.122967000 +0100 @@ -72,12 +72,14 @@ fi # Use dbus-launch if installed. -if test x"$DBUS_SESSION_BUS_ADDRESS" = x""; then - dbuslaunch=`which dbus-launch` - if test x"$dbuslaunch" != x"" -a x"$dbuslaunch" != x"no"; then - eval `$dbuslaunch --sh-syntax --exit-with-session` - fi -fi +dbuslaunch=`which dbus-launch` +case "x$dbuslaunch" in + x|xno*) + ;; + *) + $dbuslaunch --sh-syntax --exit-with-session + ;; +esac # Run xfce4-session if installed xfcesm=`which xfce4-session`