| Index: third_party/xdg-utils/scripts/xdg-email
|
| ===================================================================
|
| --- third_party/xdg-utils/scripts/xdg-email (revision 79909)
|
| +++ third_party/xdg-utils/scripts/xdg-email (working copy)
|
| @@ -332,7 +332,7 @@
|
| ;;
|
|
|
| --version)
|
| - echo "xdg-email 1.0.2"
|
| + echo "xdg-email 1.1.0 rc1"
|
| exit_success
|
| ;;
|
| esac
|
| @@ -360,6 +360,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
|
| }
|
|
|
| @@ -370,10 +372,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
|
| @@ -434,8 +437,9 @@
|
|
|
| open_kde()
|
| {
|
| - local client
|
| - client=`kreadconfig --file emaildefaults --group PROFILE_Default --key EmailClient | cut -d ' ' -f 1`
|
| + local client kde_email_profile_name
|
| + kde_email_profile_name=`kreadconfig --file emaildefaults --group Defaults --key Profile`
|
| + client=`kreadconfig --file emaildefaults --group PROFILE_"$kde_email_profile_name" --key EmailClient | cut -d ' ' -f 1`
|
| echo $client | grep thunderbird > /dev/null 2>&1
|
| if [ $? -eq 0 ] ; then
|
| run_thunderbird "$client" "$1"
|
| @@ -713,7 +717,7 @@
|
| open_xfce "${mailto}"
|
| ;;
|
|
|
| - generic)
|
| + generic|lxde)
|
| open_generic "${mailto}"
|
| ;;
|
|
|
|
|