--- /usr/bin/xdg-desktop-icon	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-desktop-icon	2011-02-08 14:02:13.850000124 +0200
@@ -407,7 +407,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi
--- /usr/bin/xdg-desktop-menu	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-desktop-menu	2011-02-08 14:01:41.143333504 +0200
@@ -603,7 +603,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi
--- /usr/bin/xdg-email	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-email	2011-02-08 14:01:08.116666836 +0200
@@ -359,7 +359,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi
--- /usr/bin/xdg-icon-resource	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-icon-resource	2011-02-08 14:00:54.450000189 +0200
@@ -399,7 +399,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi
--- /usr/bin/xdg-mime	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-mime	2011-02-08 14:00:35.153333502 +0200
@@ -429,7 +429,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi
--- /usr/bin/xdg-open	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-open	2011-02-08 14:00:09.896666852 +0200
@@ -306,7 +306,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi
--- /usr/bin/xdg-screensaver	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-screensaver	2011-02-08 13:59:48.360000176 +0200
@@ -334,7 +334,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi
--- /usr/bin/xdg-settings	2011-02-05 13:10:06.000000000 +0200
+++ /usr/bin/xdg-settings	2011-02-08 13:59:26.243334099 +0200
@@ -314,7 +314,7 @@
     if [ x"$KDE_FULL_SESSION" = x"true" ]; then DE=kde;
     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"$(echo "$DESKTOP_SESSION" | grep -i 'xfce')" != x"" ]; then DE=xfce;
     elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
     else DE=""
     fi