Commit 163cc213 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'bugfix/15602-efail' into stable (refs: #15602, fix-committed: #15610)

parents c663a13c 59fce034
......@@ -25,6 +25,9 @@ pref("mailnews.database.global.indexer.enabled", false);
// Disable chat
pref("mail.chat.enabled", false);
// Hide the "Know your rights" message
pref("mail.rights.version", 1);
// Disable system addons
pref("extensions.autoDisableScopes", 3);
pref("extensions.enabledScopes", 4);
......@@ -53,5 +56,5 @@ pref("mailnews.auto_config.dns_mx_lookup.enabled", false);
// We disable Memory Hole for encrypted email until support is more
// mature and widely spread (#15201).
pref("extensions.enigmail.protectHeaders", false);
pref("extensions.torbirdy.custom.extensions.enigmail.protectHeaders", false);
pref("extensions.enigmail.protectedHeaders", 0);
pref("extensions.torbirdy.custom.extensions.enigmail.protectedHeaders", 0);
/* Required, do not remove */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
#torbirdy-jondo-selection,
#torbirdy-whonix-selection,
#torbirdy-tor-selection,
......
......@@ -29,16 +29,6 @@ configure_default_incoming_protocol() {
}
start_thunderbird() {
# Give Thunderbird its own temp directory, similar rationale to a1fd1f0f & #9558.
TMPDIR="${PROFILE}/tmp"
mkdir --mode=0700 -p "$TMPDIR"
export TMPDIR
# Clean the temporary directory: it's generally persistent, and then
# temporary files (including decrypted attachements) would otherwise
# be stored forever there (#13340).
rm -rf "${TMPDIR}"/*
export GNOME_ACCESSIBILITY=1
unset SESSION_MANAGER
......
......@@ -55,24 +55,3 @@
/sys/devices/system/cpu/ r,
/sys/devices/system/cpu/** r,
@@ -373,13 +362,16 @@
# for revocation certificate generation
owner @{HOME}/.{icedove,thunderbird}/*/0x[A-F0-9]*_rev.asc rw,
+ # for revocation certificate generation
+ owner @{HOME}/.{icedove,thunderbird}/*.default/0x[A-F0-9]*_rev.asc rw,
+
# for signature generation
- owner /tmp/nsemail.eml w,
- owner /tmp/nsemail-[0-9]*.eml w,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/nsemail.eml w,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/nsemail-[0-9]*.eml w,
# for signature verifications
- owner /tmp/data.sig r,
- owner /tmp/data-[0-9]*.sig r,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/data.sig r,
+ owner @{HOME}/.{icedove,thunderbird}/*.default/tmp/data-[0-9]*.sig r,
owner /tmp/gpg-[a-zA-Z0-9]*/S.gpg-agent rw,
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment