Attachment 12807 Details for Bug 13435 – proposed fix

[patch] proposed fix

xdg-email-thunderbird.diff (text/plain), 3.27 KB, created by Lei Zhang on 2007-11-28 14:47:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lei Zhang

Created: 2007-11-28 14:47:34 UTC

Size: 3.27 KB

patch

obsolete

>Index: xdg-email
>===================================================================
>RCS file: /cvs/portland/portland/xdg-utils/scripts/xdg-email,v
>retrieving revision 1.36
>diff -u -r1.36 xdg-email
>--- xdg-email	21 Nov 2006 20:29:55 -0000	1.36
>+++ xdg-email	28 Nov 2007 22:38:54 -0000
>@@ -377,14 +377,81 @@
>     return 0
> }
> 
>+run_thunderbird()
>+{
>+    local THUNDERBIRD MAILTO NEWMAILTO TO CC BCC SUBJECT BODY ATTACH
>+    THUNDERBIRD="$1"
>+    MAILTO=$(echo "$2" | sed 's/^mailto://')
>+    echo "$MAILTO" | grep -qs "^?"
>+    if [ "$?" = "0" ] ; then
>+        MAILTO=$(echo "$MAILTO" | sed 's/^?//')
>+    else
>+        MAILTO=$(echo "$MAILTO" | sed 's/^/to=/' | sed 's/?/\&/')
>+    fi
>+
>+    MAILTO=$(echo "$MAILTO" | sed 's/&/\n/g')
>+    TO=$(echo "$MAILTO" | grep '^to=' | sed 's/^to=//' | awk '{ printf "%s,",$0 }')
>+    CC=$(echo "$MAILTO" | grep '^cc=' | sed 's/^cc=//' | awk '{ printf "%s,",$0 }')
>+    BCC=$(echo "$MAILTO" | grep '^bcc=' | sed 's/^bcc=//' | awk '{ printf "%s,",$0 }')
>+    SUBJECT=$(echo "$MAILTO" | grep '^subject=' | tail -n 1)
>+    BODY=$(echo "$MAILTO" | grep '^body=' | tail -n 1)
>+    ATTACH=$(echo "$MAILTO" | sed 's/^attach=/\n\nfile:\/\//g' | awk '/^file:/ { printf "%s,",$0 }')
>+
>+    if [ -z "$TO" ] ; then
>+        NEWMAILTO=
>+    else
>+        NEWMAILTO="to='$TO'"
>+    fi
>+    if [ -n "$CC" ] ; then
>+        NEWMAILTO="${NEWMAILTO},cc='$CC'"
>+    fi
>+    if [ -n "$BCC" ] ; then
>+        NEWMAILTO="${NEWMAILTO},bcc='$BCC'"
>+    fi
>+    if [ -n "$SUBJECT" ] ; then
>+        NEWMAILTO="${NEWMAILTO},$SUBJECT"
>+    fi
>+    if [ -n "$BODY" ] ; then
>+        NEWMAILTO="${NEWMAILTO},$BODY"
>+    fi
>+
>+    if [ -n "$ATTACH" ] ; then
>+        NEWMAILTO="${NEWMAILTO},attachment='${ATTACH}'"
>+    fi
>+
>+    NEWMAILTO=$(echo "$NEWMAILTO" | sed 's/^,//')
>+    DEBUG 1 "Running $THUNDERBIRD -compose \"$NEWMAILTO\""
>+    "$THUNDERBIRD" -compose "$NEWMAILTO"
>+    if [ $? -eq 0 ]; then
>+        exit_success
>+    else
>+        exit_failure_operation_failed
>+    fi
>+}
>+
>+get_client_kde()
>+{
>+    kreadconfig --file emaildefaults --group PROFILE_Default --key EmailClient | cut -d ' ' -f 1
>+}
>+
>+get_client_gnome()
>+{
>+    gconftool --get /desktop/gnome/url-handlers/mailto/command | cut -d ' ' -f 1
>+}
>+
> open_kde()
> {
>     local client
>+    client=$(get_client_kde)
>+    echo $client | grep thunderbird > /dev/null 2>&1
>+    if [ $? -eq 0 ] ; then
>+        run_thunderbird "$client" "$1"
>+    fi
>+
>     if [ -f /etc/SuSE-release ] ; then
>         # Workaround for SUSE 10.0
>-        client=`kreadconfig --file emaildefaults --group PROFILE_Default --key EmailClient| cut -d ' ' -f 1`
>-        [ -z $client ] && client="kmail"
>-        if ! which $client > /dev/null 2> /dev/null; then
>+        [ -z "$client" ] && client="kmail"
>+        if ! which "$client" > /dev/null 2> /dev/null; then
>             DEBUG 3 "KDE has $client configured as email client which isn't installed"
>             if which gnome-open > /dev/null 2> /dev/null && which evolution > /dev/null 2> /dev/null; then
>                DEBUG 3 "Try gnome-open instead"
>@@ -406,6 +473,13 @@
> 
> open_gnome()
> {
>+    local client
>+    client=$(get_client_gnome)
>+    echo $client | grep thunderbird > /dev/null 2>&1
>+    if [ $? -eq 0 ] ; then
>+        run_thunderbird "$client" "$1"
>+    fi
>+
>     DEBUG 1 "Running gnome-open \"$1\""
>     gnome-open "$1"
>

Actions: View | Splinter Review

Attachments on bug 13435: 12807 | 33640 | 35340

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.