Commit 1700ffa7 authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'bugfix/15746-hide-enigmail-config-wizard' into devel (Fix-committed: #15746)

parents f8465e87 cc7b3c9f
......@@ -28,12 +28,37 @@ configure_default_incoming_protocol() {
"${default_protocol}"
}
thunderbird_profile_is_new() {
[ ! -f "${PROFILE}/extensions.ini" ]
}
initialize_enigmail_configured_version() {
mkdir -p "${PROFILE}/preferences"
version="$(dpkg-query --show \
--showformat='${source:Upstream-Version}' \
enigmail | sed -E 's,\+.*$,,')"
# Set the value in prefs.js so that Enigmail can manage it itself
# once we've done this once.
set_mozilla_pref "${PROFILE}/prefs.js" \
"extensions.enigmail.configuredVersion" \
"\"${version}\"" \
'user_pref'
}
start_thunderbird() {
export GNOME_ACCESSIBILITY=1
unset SESSION_MANAGER
configure_default_incoming_protocol
# Suppress Enigmail's configuration wizard by pretending that the current
# version was already configured. Only do this on first run though:
# once we've done this we let Enigmail manage this setting itself
# so it can run any migration code it wants to on upgrades.
if thunderbird_profile_is_new; then
initialize_enigmail_configured_version
fi
exec /usr/bin/thunderbird --class "Thunderbird" -profile "${PROFILE}" "${@}"
}
......
......@@ -437,6 +437,14 @@ activate_volumes ()
fi
fi
# Get rid of any Enigmail configuredVersion that we previously used
# to set in a way that would persistently override the value maintained
# by Enigmail itself (#12680, #15693). We stopped writing this pref
# there a long time ago but recently instructed users to reintroduce
# this problem as a workaround (#15692).
tb_profile="$(dirname "${conf}")/thunderbird/profile.default"
rm -f "${tb_profile}/preferences/0000tails.js"
for vol in ${open_volumes}
do
if grep -qe "^${vol}\>" /proc/mounts
......
Markdown is supported
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