[arch-commits] Commit in xdg-utils/trunk (xfce-detection.diff)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon May 28 14:15:36 UTC 2012
Date: Monday, May 28, 2012 @ 10:15:36
Author: andyrtr
Revision: 160048
remove unneeded patch
Deleted:
xdg-utils/trunk/xfce-detection.diff
---------------------+
xfce-detection.diff | 49 -------------------------------------------------
1 file changed, 49 deletions(-)
Deleted: xfce-detection.diff
===================================================================
--- xfce-detection.diff 2012-05-28 14:14:28 UTC (rev 160047)
+++ xfce-detection.diff 2012-05-28 14:15:36 UTC (rev 160048)
@@ -1,49 +0,0 @@
---- scripts/xdg-open 2011-01-01 05:03:14.000000000 -0500
-+++ scripts/xdg-open.new 2011-06-19 00:43:13.000000000 -0400
-@@ -303,12 +303,35 @@
-
- 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 [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
-- else DE=""
-+ 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;
-+ ;;
-+ 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 > /dev/null 2>&1 || DE="gnome3"
- fi
- }
-
-@@ -535,7 +558,7 @@
- open_kde "$url"
- ;;
-
-- gnome)
-+ gnome*)
- open_gnome "$url"
- ;;
-
More information about the arch-commits
mailing list