mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Send attachments to xdg-email also as --attach arguments

Browse Source 
Intended to handle the potential end of support of "attach" in mailto URLs,
as discussed in https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/177.

Change-Id: If1e9a7161e9805f634fcab5fb83e6f172af54d1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178701
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
Tested-by: Jenkins
This commit is contained in:
Mike Kaganski
2024-12-18 11:18:27 +05:00
parent 280edea496
commit d38e0d615c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shell/source/unix/misc/senddoc.sh
View File

@@ -68,7 +68,9 @@ case $(printf %s "$MAILER_TYPE" | sed 's/-.*$//') in
;; ;;
evolution | gnome | groupwise | xdg) # NB. shortened from the dash on evolution | gnome | groupwise | xdg) # NB. shortened from the dash on
MAILER_TYPE=generic-mailto if [ "$MAILER_TYPE" != "xdg-email" ]; then
MAILER_TYPE=generic-mailto
fi
;; ;;
dtmail) dtmail)
@@ -84,6 +86,8 @@ case $(printf %s "$MAILER_TYPE" | sed 's/-.*$//') in
;; ;;
*) *)
MAILER_TYPE=generic-mailto
# LO is configured to use something we do not recognize, or is not configured. # LO is configured to use something we do not recognize, or is not configured.
# Try to be smart, and send the mail anyway, if we have the # Try to be smart, and send the mail anyway, if we have the
# possibility to do so. # possibility to do so.
@@ -104,7 +108,9 @@ case $(printf %s "$MAILER_TYPE" | sed 's/-.*$//') in
exit 2 exit 2
fi fi
MAILER_TYPE=generic-mailto if [ "$(basename "$MAILER")" = "xdg-email" ]; then
MAILER_TYPE=xdg-email
fi
;; ;;
esac esac
@@ -269,7 +275,7 @@ case $MAILER_TYPE in
rm -f "$BODY" rm -f "$BODY"
;; ;;
generic-mailto) generic-mailto | xdg-email)
while [ "$1" != "" ]; do while [ "$1" != "" ]; do
case $1 in case $1 in
@@ -301,6 +307,10 @@ case $MAILER_TYPE in
# Just add both attach and attachment "headers" - some apps use one, some the other # Just add both attach and attachment "headers" - some apps use one, some the other
ATTACH_URL=$(printf file://%s "$2" | "${URI_ENCODE}") ATTACH_URL=$(printf file://%s "$2" | "${URI_ENCODE}")
MAILTO="${MAILTO:+${MAILTO}&}attach=${ATTACH_URL}&attachment=${ATTACH_URL}" MAILTO="${MAILTO:+${MAILTO}&}attach=${ATTACH_URL}&attachment=${ATTACH_URL}"
if [ "$MAILER_TYPE" = "xdg-email" ]; then
# Also add the argument: see https://gitlab.freedesktop.org/xdg/xdg-utils/-/issues/177
ATTACH="${ATTACH:+${ATTACH} }--attach \"$2\""
fi
shift shift
;; ;;
*) *)
@@ -310,7 +320,7 @@ case $MAILER_TYPE in
done done
MAILTO="mailto:${TO}?${MAILTO}" MAILTO="mailto:${TO}?${MAILTO}"
${MAILER} "${MAILTO}" & eval "${MAILER} ${ATTACH} \"${MAILTO}\"" &
;; ;;
dtmail) dtmail)