diff -ur a/scripts/xdg-desktop-icon b/scripts/xdg-desktop-icon --- a/scripts/xdg-desktop-icon 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-desktop-icon 2011-02-10 22:32:57.646789118 +0000 @@ -408,6 +408,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi diff -ur a/scripts/xdg-desktop-menu b/scripts/xdg-desktop-menu --- a/scripts/xdg-desktop-menu 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-desktop-menu 2011-02-10 22:32:57.663455519 +0000 @@ -604,6 +604,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi diff -ur a/scripts/xdg-email b/scripts/xdg-email --- a/scripts/xdg-email 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-email 2011-02-10 22:32:57.680121915 +0000 @@ -360,6 +360,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi diff -ur a/scripts/xdg-icon-resource b/scripts/xdg-icon-resource --- a/scripts/xdg-icon-resource 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-icon-resource 2011-02-10 22:32:57.696788312 +0000 @@ -400,6 +400,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi diff -ur a/scripts/xdg-mime b/scripts/xdg-mime --- a/scripts/xdg-mime 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-mime 2011-02-10 22:32:57.713454709 +0000 @@ -430,6 +430,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi diff -ur a/scripts/xdg-open b/scripts/xdg-open --- a/scripts/xdg-open 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-open 2011-02-10 22:32:57.730121106 +0000 @@ -307,6 +307,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi diff -ur a/scripts/xdg-screensaver b/scripts/xdg-screensaver --- a/scripts/xdg-screensaver 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-screensaver 2011-02-10 22:32:57.746787504 +0000 @@ -335,6 +335,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi diff -ur a/scripts/xdg-settings b/scripts/xdg-settings --- a/scripts/xdg-settings 2011-01-01 10:03:14.000000000 +0000 +++ b/scripts/xdg-settings 2011-02-10 22:32:02.674345129 +0000 @@ -315,6 +315,7 @@ elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome; elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome; elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce; + elif [ x"$DESKTOP_SESSION" == x"xfce" ]; then DE=xfce; elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde; else DE="" fi