Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2245)

Unified Diff: third_party/xdg-utils/scripts/xdg-utils-common.in

Issue 6737007: Update xdg-utils to the latest version available in git. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/xdg-utils/scripts/xdg-terminal.in ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/xdg-utils/scripts/xdg-utils-common.in
===================================================================
--- third_party/xdg-utils/scripts/xdg-utils-common.in (revision 79909)
+++ third_party/xdg-utils/scripts/xdg-utils-common.in (working copy)
@@ -169,7 +169,7 @@
;;
--version)
- echo "@NAME@ 1.0.2"
+ echo "@NAME@ 1.1.0 rc1"
exit_success
;;
esac
@@ -197,8 +197,25 @@
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;
fi
+
+ if [ x"$DE" = x"" ]; then
+ # if all else fails, fallback to checking $DESKTOP_SESSION
+ case "$DESKTOP_SESSION" in
+ LXDE)
+ DE=lxde;
+ ;;
+ xfce|xfce4)
+ DE=xfce;
+ ;;
+ esac
+ fi
+
+ if [ x"$DE" = x"gnome" ]; then
+ # gnome-default-applications-properties is only available in GNOME 2.x
+ # but not in GNOME 3.x
+ which gnome-default-applications-properties 2> /dev/null || DE="gnome3"
+ fi
}
#----------------------------------------------------------------------------
@@ -208,7 +225,8 @@
kfmclient_fix_exit_code()
{
- version=`kde${KDE_SESSION_VERSION}-config --version 2>/dev/null | grep '^KDE'`
+ [ 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/'`
« no previous file with comments | « third_party/xdg-utils/scripts/xdg-terminal.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698