| Index: third_party/xdg-utils/scripts/xdg-desktop-menu
|
| ===================================================================
|
| --- third_party/xdg-utils/scripts/xdg-desktop-menu (revision 79909)
|
| +++ third_party/xdg-utils/scripts/xdg-desktop-menu (working copy)
|
| @@ -82,7 +82,7 @@
|
| To add menu items to a new submenu the desktop-files must be preceded by a
|
| directory-file that describes the submenu. If multiple desktop-files are
|
| specified, all entries will be added to the same menu. If entries are
|
| - installed to a menu that has been created with a previous call to
|
| + installed to a menu that has been created with a previous call to
|
| xdg-desktop-menu the entries will be installed in addition to any already
|
| existing entries.
|
|
|
| @@ -576,7 +576,7 @@
|
| ;;
|
|
|
| --version)
|
| - echo "xdg-desktop-menu 1.0.2"
|
| + echo "xdg-desktop-menu 1.1.0 rc1"
|
| exit_success
|
| ;;
|
| esac
|
| @@ -604,6 +604,8 @@
|
| 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"LXDE" ]; then DE=lxde;
|
| + else DE=""
|
| fi
|
| }
|
|
|
| @@ -614,10 +616,11 @@
|
|
|
| kfmclient_fix_exit_code()
|
| {
|
| - version=`kde${KDE_SESSION_VERSION}-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/'`
|
| - release=`echo $version | sed 's/KDE: [0-9]*\.[0-9]*\.\([0-9]\).*/\1/'`
|
| + [ 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/'`
|
| + release=`echo $version | sed 's/KDE.*: [0-9]*\.[0-9]*\.\([0-9]\).*/\1/'`
|
| test "$major" -gt 3 && return $1
|
| test "$minor" -gt 5 && return $1
|
| test "$release" -gt 4 && return $1
|
|
|