| Index: scripts/xdg-desktop-menu
|
| ===================================================================
|
| --- scripts/xdg-desktop-menu (revision 81021)
|
| +++ scripts/xdg-desktop-menu (working copy)
|
| @@ -600,15 +600,21 @@
|
|
|
| detectDE()
|
| {
|
| + # see https://bugs.freedesktop.org/show_bug.cgi?id=34164
|
| + unset GREP_OPTIONS
|
| +
|
| 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 xprop -root 2> /dev/null | grep -i '^xfce_desktop_window' >/dev/null 2>&1; then DE=xfce
|
| fi
|
|
|
| if [ x"$DE" = x"" ]; then
|
| # fallback to checking $DESKTOP_SESSION
|
| case "$DESKTOP_SESSION" in
|
| + gnome)
|
| + DE=gnome;
|
| LXDE)
|
| DE=lxde;
|
| ;;
|
| @@ -641,7 +647,6 @@
|
|
|
| kfmclient_fix_exit_code()
|
| {
|
| - [ x"$KDE_SESSION_VERSION" = x"4" ] && return 0;
|
| version=`LC_ALL=C.UTF-8 kde-config --version 2>/dev/null | grep '^KDE'`
|
| major=`echo $version | sed 's/KDE.*: \([0-9]\).*/\1/'`
|
| minor=`echo $version | sed 's/KDE.*: [0-9]*\.\([0-9]\).*/\1/'`
|
|
|