Hello community, here is the log from the commit of package enigmail for openSUSE:Factory checked in at 2016-04-11 09:14:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enigmail (Old) and /work/SRC/openSUSE:Factory/.enigmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enigmail" Changes: -------- --- /work/SRC/openSUSE:Factory/enigmail/enigmail.changes 2016-03-03 15:16:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.enigmail.new/enigmail.changes 2016-04-11 10:26:26.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Apr 7 18:21:06 UTC 2016 - [email protected] + +- enigmail 1.9.1: + * fix recignition of MS Exchange messages + * fix slow PGP/MIME signature verification with attachments + * fix freeze with large mail with signature + * fix backup/restore UI + * fix UI issues with German umlauts + +------------------------------------------------------------------- Old: ---- enigmail-1.9.tar.gz enigmail-1.9.tar.gz.asc New: ---- enigmail-1.9.1.tar.gz enigmail-1.9.1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enigmail.spec ++++++ --- /var/tmp/diff_new_pack.sUhHWj/_old 2016-04-11 10:26:27.000000000 +0200 +++ /var/tmp/diff_new_pack.sUhHWj/_new 2016-04-11 10:26:27.000000000 +0200 @@ -18,7 +18,7 @@ Name: enigmail -Version: 1.9 +Version: 1.9.1 Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ ++++++ enigmail-1.9.tar.gz -> enigmail-1.9.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/Makefile new/enigmail/Makefile --- old/enigmail/Makefile 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/Makefile 2016-03-06 13:03:48.000000000 +0100 @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPI_MODULE = enigmail -XPI_MODULE_VERS = 1.9 +XPI_MODULE_VERS = 1.9.1 DEPTH = . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/configure new/enigmail/configure --- old/enigmail/configure 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/configure 2016-03-06 13:03:48.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for enigmail 1.9. +# Generated by GNU Autoconf 2.69 for enigmail 1.9.1. # # Report bugs to <https://www.enigmail.net>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='enigmail' PACKAGE_TARNAME='enigmail' -PACKAGE_VERSION='1.9' -PACKAGE_STRING='enigmail 1.9' +PACKAGE_VERSION='1.9.1' +PACKAGE_STRING='enigmail 1.9.1' PACKAGE_BUGREPORT='https://www.enigmail.net' PACKAGE_URL='' @@ -1195,7 +1195,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures enigmail 1.9 to adapt to many kinds of systems. +\`configure' configures enigmail 1.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1261,7 +1261,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of enigmail 1.9:";; + short | recursive ) echo "Configuration of enigmail 1.9.1:";; esac cat <<\_ACEOF @@ -1343,7 +1343,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -enigmail configure 1.9 +enigmail configure 1.9.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by enigmail $as_me 1.9, which was +It was created by enigmail $as_me 1.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2595,7 +2595,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by enigmail $as_me 1.9, which was +This file was extended by enigmail $as_me 1.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2648,7 +2648,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -enigmail config.status 1.9 +enigmail config.status 1.9.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/configure.ac new/enigmail/configure.ac --- old/enigmail/configure.ac 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/configure.ac 2016-03-06 13:03:48.000000000 +0100 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) min_automake_version="1.10" -AC_INIT([enigmail],[1.9], [https://www.enigmail.net]) +AC_INIT([enigmail],[1.9.1], [https://www.enigmail.net]) AC_PATH_PROG(PYTHON, "python2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ipc/modules/subprocess.jsm new/enigmail/ipc/modules/subprocess.jsm --- old/enigmail/ipc/modules/subprocess.jsm 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/ipc/modules/subprocess.jsm 2016-03-06 13:03:48.000000000 +0100 @@ -354,8 +354,6 @@ function LogError(s) { if (gLogFunc) gLogFunc(s); - else - dump(s); } function debugLog(s) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/app.jsm new/enigmail/package/app.jsm --- old/enigmail/package/app.jsm 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/app.jsm 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, dump: false */ +/*global Components: false */ /*jshint -W097 */ /* * This Source Code Form is subject to the terms of the Mozilla Public @@ -67,12 +67,7 @@ }, initAddon: function() { - try { - AddonManager.getAddonByID(ENIG_EXTENSION_GUID, EnigmailApp.registerAddon); - } - catch (ex) { - dump("enigmailCommon.jsm: init error: " + ex + "\n"); - } + AddonManager.getAddonByID(ENIG_EXTENSION_GUID, EnigmailApp.registerAddon); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/configure.jsm new/enigmail/package/configure.jsm --- old/enigmail/package/configure.jsm 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/configure.jsm 2016-03-06 13:03:48.000000000 +0100 @@ -17,7 +17,6 @@ /*global EnigmailLog: false, EnigmailPrefs: false, EnigmailTimer: false, EnigmailApp: false, EnigmailLocale: false, EnigmailDialog: false, EnigmailWindows: false */ -/*global dump: false */ Cu.import("resource://enigmail/log.jsm"); Cu.import("resource://enigmail/prefs.jsm"); @@ -220,70 +219,66 @@ EnigmailLog.DEBUG("configure.jsm: configureEnigmail\n"); let oldVer = EnigmailPrefs.getPref("configuredVersion"); - try { - let vc = Cc["@mozilla.org/xpcom/version-comparator;1"].getService(Ci.nsIVersionComparator); - if (oldVer === "") { - EnigmailWindows.openSetupWizard(win, false); - } - else { - if (oldVer < "0.95") { - try { - upgradeHeadersView(); - upgradeOldPgpMime(); - upgradeRecipientsSelection(); - } - catch (ex) {} - } - if (vc.compare(oldVer, "1.0") < 0) { - upgradeCustomHeaders(); + let vc = Cc["@mozilla.org/xpcom/version-comparator;1"].getService(Ci.nsIVersionComparator); + if (oldVer === "") { + EnigmailWindows.openSetupWizard(win, false); + } + else { + if (oldVer < "0.95") { + try { + upgradeHeadersView(); + upgradeOldPgpMime(); + upgradeRecipientsSelection(); } - if (vc.compare(oldVer, "1.7a1pre") < 0) { - // 1: rules only - // => assignKeysByRules true; rest false - // 2: rules & email addresses (normal) - // => assignKeysByRules/assignKeysByEmailAddr/assignKeysManuallyIfMissing true - // 3: email address only (no rules) - // => assignKeysByEmailAddr/assignKeysManuallyIfMissing true - // 4: manually (always prompt, no rules) - // => assignKeysManuallyAlways true - // 5: no rules, no key selection - // => assignKeysByRules/assignKeysByEmailAddr true + catch (ex) {} + } + if (vc.compare(oldVer, "1.0") < 0) { + upgradeCustomHeaders(); + } + if (vc.compare(oldVer, "1.7a1pre") < 0) { + // 1: rules only + // => assignKeysByRules true; rest false + // 2: rules & email addresses (normal) + // => assignKeysByRules/assignKeysByEmailAddr/assignKeysManuallyIfMissing true + // 3: email address only (no rules) + // => assignKeysByEmailAddr/assignKeysManuallyIfMissing true + // 4: manually (always prompt, no rules) + // => assignKeysManuallyAlways true + // 5: no rules, no key selection + // => assignKeysByRules/assignKeysByEmailAddr true - upgradePrefsSending(); - } - if (vc.compare(oldVer, "1.7") < 0) { - // open a modal dialog. Since this might happen during the opening of another - // window, we have to do this asynchronously - EnigmailTimer.setTimeout( - function _cb() { - var doIt = EnigmailDialog.confirmDlg(win, - EnigmailLocale.getString("enigmailCommon.versionSignificantlyChanged"), - EnigmailLocale.getString("enigmailCommon.checkPreferences"), - EnigmailLocale.getString("dlg.button.close")); - if (!startingPreferences && doIt) { - // same as: - // - EnigmailWindows.openPrefWindow(window, true, 'sendingTab'); - // but - // - without starting the service again because we do that right now - // - and modal (waiting for its end) - win.openDialog("chrome://enigmail/content/pref-enigmail.xul", - "_blank", "chrome,resizable=yes,modal", { - 'showBasic': true, - 'clientType': 'thunderbird', - 'selectTab': 'sendingTab' - }); - } - }, 100); - } + upgradePrefsSending(); + } + if (vc.compare(oldVer, "1.7") < 0) { + // open a modal dialog. Since this might happen during the opening of another + // window, we have to do this asynchronously + EnigmailTimer.setTimeout( + function _cb() { + var doIt = EnigmailDialog.confirmDlg(win, + EnigmailLocale.getString("enigmailCommon.versionSignificantlyChanged"), + EnigmailLocale.getString("enigmailCommon.checkPreferences"), + EnigmailLocale.getString("dlg.button.close")); + if (!startingPreferences && doIt) { + // same as: + // - EnigmailWindows.openPrefWindow(window, true, 'sendingTab'); + // but + // - without starting the service again because we do that right now + // - and modal (waiting for its end) + win.openDialog("chrome://enigmail/content/pref-enigmail.xul", + "_blank", "chrome,resizable=yes,modal", { + 'showBasic': true, + 'clientType': 'thunderbird', + 'selectTab': 'sendingTab' + }); + } + }, 100); + } - if (vc.compare(oldVer, "1.9a2pre") < 0) { - defaultPgpMime(); - } + if (vc.compare(oldVer, "1.9a2pre") < 0) { + defaultPgpMime(); } } - catch (ex) { - dump("Error: " + ex.toString()); - } + EnigmailPrefs.setPref("configuredVersion", EnigmailApp.getVersion()); EnigmailPrefs.savePrefs(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/enigmail.js new/enigmail/package/enigmail.js --- old/enigmail/package/enigmail.js 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/enigmail.js 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, dump: false */ +/*global Components: false */ /*jshint -W097 */ /* * This Source Code Form is subject to the terms of the Mozilla Public @@ -353,5 +353,3 @@ const NSGetFactory = XPCOMUtils.generateNSGetFactory([Enigmail, EnigmailProtocolHandler, EnigmailCommandLine.Handler]); EnigmailFilters.registerAll(); - -dump("enigmail.js: Registered components\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/install.rdf new/enigmail/package/install.rdf --- old/enigmail/package/install.rdf 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/install.rdf 2016-03-06 13:03:48.000000000 +0100 @@ -5,7 +5,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id> - <em:version>1.9</em:version> + <em:version>1.9.1</em:version> <em:type>2</em:type> <!-- type = extension --> <em:unpack>true</em:unpack> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/lazy.jsm new/enigmail/package/lazy.jsm --- old/enigmail/package/lazy.jsm 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/lazy.jsm 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, dump: false */ +/*global Components: false */ /*jshint -W097 */ /* * This Source Code Form is subject to the terms of the Mozilla Public diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/mimeDecrypt.jsm new/enigmail/package/mimeDecrypt.jsm --- old/enigmail/package/mimeDecrypt.jsm 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/mimeDecrypt.jsm 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, dump: false */ +/*global Components: false */ /*jshint -W097 */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -475,17 +475,11 @@ } function initModule() { - try { - var env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment); - var nspr_log_modules = env.get("NSPR_LOG_MODULES"); - var matches = nspr_log_modules.match(/mimeDecrypt:(\d+)/); - - if (matches && (matches.length > 1)) { - gDebugLogLevel = matches[1]; - dump("mimeDecrypt.jsm: enabled debug logging\n"); - } - } - catch (ex) { - dump("caught error " + ex); + var env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment); + var nspr_log_modules = env.get("NSPR_LOG_MODULES"); + var matches = nspr_log_modules.match(/mimeDecrypt:(\d+)/); + + if (matches && (matches.length > 1)) { + gDebugLogLevel = matches[1]; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/mimeEncrypt.js new/enigmail/package/mimeEncrypt.js --- old/enigmail/package/mimeEncrypt.js 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/mimeEncrypt.js 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, EnigmailLog: false, EnigmailDialog: false, dump: false, EnigmailFuncs: false */ +/*global Components: false, EnigmailLog: false, EnigmailDialog: false, EnigmailFuncs: false */ /*jshint -W097 */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -595,22 +595,16 @@ } function initModule() { - try { - var env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment); - var nspr_log_modules = env.get("NSPR_LOG_MODULES"); - var matches = nspr_log_modules.match(/mimeEncrypt:(\d+)/); - - if (matches && (matches.length > 1)) { - gDebugLogLevel = matches[1]; - LOCAL_DEBUG("mimeEncrypt.js: enabled debug logging\n"); - } - } - catch (ex) { - dump("caught error " + ex); + var env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment); + var nspr_log_modules = env.get("NSPR_LOG_MODULES"); + var matches = nspr_log_modules.match(/mimeEncrypt:(\d+)/); + + if (matches && (matches.length > 1)) { + gDebugLogLevel = matches[1]; + LOCAL_DEBUG("mimeEncrypt.js: enabled debug logging\n"); } } var NSGetFactory = XPCOMUtils.generateNSGetFactory([PgpMimeEncrypt]); initModule(); -dump("mimeEncrypt.js: module initialized\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/mimeVerify.jsm new/enigmail/package/mimeVerify.jsm --- old/enigmail/package/mimeVerify.jsm 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/mimeVerify.jsm 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, dump: false */ +/*global Components: false */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -238,23 +238,26 @@ } } - if (this.readMode == 1) { + if (this.readMode === 1) { // "real data" - let i = this.findNextMimePart(); - let write = ""; - if (i >= 0) { - if (this.keepData[i - 2] == '\r' && this.keepData[i - 1] == '\n') { - --i; - } + if (data.indexOf("-") >= 0) { // only check current line for speed reasons + let i = this.findNextMimePart(); + if (i >= 0) { + // end of "read data found" + if (this.keepData[i - 2] == '\r' && this.keepData[i - 1] == '\n') { + --i; + } - this.signedData = this.keepData.substr(0, i - 1); - this.keepData = this.keepData.substr(i); - this.readMode = 2; + this.signedData = this.keepData.substr(0, i - 1); + this.keepData = this.keepData.substr(i); + this.readMode = 2; + } } - + else + return; } - if (this.readMode == 2) { + if (this.readMode === 2) { let i = this.keepData.indexOf("--" + this.boundary + "--"); if (i >= 0) { // ensure that we keep everything until we got the "end" boundary @@ -266,7 +269,7 @@ } } - if (this.readMode == 3) { + if (this.readMode === 3) { // signature data let xferEnc = this.getContentTransferEncoding(); if (xferEnc.search(/base64/i) >= 0) { @@ -575,20 +578,13 @@ } function initModule() { - try { - var env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment); - var nspr_log_modules = env.get("NSPR_LOG_MODULES"); - var matches = nspr_log_modules.match(/mimeVerify:(\d+)/); - - if (matches && (matches.length > 1)) { - if (matches[1] > 2) gDebugLog = true; - dump("mimeVerify.jsm: enabled debug logging\n"); - } - } - catch (ex) { - dump("caught error " + ex); + var env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment); + var nspr_log_modules = env.get("NSPR_LOG_MODULES"); + var matches = nspr_log_modules.match(/mimeVerify:(\d+)/); + + if (matches && (matches.length > 1)) { + if (matches[1] > 2) gDebugLog = true; } } initModule(); -dump("mimeVerify.jsm: module initialized\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/pgpmimeHandler.js new/enigmail/package/pgpmimeHandler.js --- old/enigmail/package/pgpmimeHandler.js 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/pgpmimeHandler.js 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, dump: false */ +/*global Components: false */ /*jshint -W097 */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -100,4 +100,3 @@ var NSGetFactory = XPCOMUtils.generateNSGetFactory([PgpMimeHandler]); -dump("pgpmimeHandler.js: registration done\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/prefs-service.js new/enigmail/package/prefs-service.js --- old/enigmail/package/prefs-service.js 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/prefs-service.js 2016-03-06 13:03:48.000000000 +0100 @@ -1,4 +1,4 @@ -/*global Components: false, dump: false */ +/*global Components: false */ /*jshint -W097 */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -37,5 +37,3 @@ var components = [EnigmailPrefService]; const NSGetFactory = XPCOMUtils.generateNSGetFactory(components); - -dump("Enigmail account manager extension registered\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/system.jsm new/enigmail/package/system.jsm --- old/enigmail/package/system.jsm 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/package/system.jsm 2016-03-06 13:03:48.000000000 +0100 @@ -93,7 +93,7 @@ p.wait(); output = output.replace(/[\r\n]/g, ""); - output = output.replace(/^(.*[: ])([0-9]+)([^0-9].*)$/, "$2"); + output = output.replace(/^(.*[: ])([0-9]+)([^0-9].*)?$/, "$2"); return output; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailMessengerOverlay.js new/enigmail/ui/content/enigmailMessengerOverlay.js --- old/enigmail/ui/content/enigmailMessengerOverlay.js 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/ui/content/enigmailMessengerOverlay.js 2016-03-06 13:03:48.000000000 +0100 @@ -52,6 +52,8 @@ Components.utils.import("resource://enigmail/constants.jsm"); /*global EnigmailConstants: false */ Components.utils.import("resource://enigmail/passwords.jsm"); /*global EnigmailPassword: false */ Components.utils.import("resource://enigmail/expiry.jsm"); /*global EnigmailExpiry: false */ +Components.utils.import("resource://enigmail/uris.jsm"); /*global EnigmailURIs: false */ +Components.utils.import("resource://enigmail/protocolHandler.jsm"); /*global EnigmailProtocolHandler: false */ if (!Enigmail) var Enigmail = {}; @@ -695,6 +697,9 @@ // signal that the structure matches to save the content later on EnigmailLog.DEBUG("enigmailMessengerOverlay: messageDecryptCb: enabling MS-Exchange hack\n"); this.buggyExchangeEmailContent = "???"; + + this.buggyMailHeader(); + return; } } @@ -746,6 +751,21 @@ } }, + // display header about reparing buggy MS-Exchange messages + buggyMailHeader: function() { + let headerSink = msgWindow.msgHeaderSink.securityInfo.QueryInterface(Components.interfaces.nsIEnigMimeHeaderSink); + + + let uriStr = EnigmailURIs.createMessageURI(this.getCurrentMsgUrl(), + "message/rfc822", + "", + "??", + false); + + let ph = new EnigmailProtocolHandler(); + let uri = ph.newURI(uriStr, "", ""); + headerSink.updateSecurityStatus("", 0, 0, "", "", "", "", "", uri, "", "1"); + }, messageParse: function(interactive, importOnly, contentEncoding, msgUriSpec) { EnigmailLog.DEBUG("enigmailMessengerOverlay.js: messageParse: " + interactive + "\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/pref-enigmail.js new/enigmail/ui/content/pref-enigmail.js --- old/enigmail/ui/content/pref-enigmail.js 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/ui/content/pref-enigmail.js 2016-03-06 13:03:48.000000000 +0100 @@ -151,7 +151,7 @@ } else { EnigCollapseAdvanced(document.getElementById("prefTabBox"), "collapsed", null); - EnigCollapseAdvanced(document.getElementById("enigPrefTabPanel"), "hidden", null); + //EnigCollapseAdvanced(document.getElementById("enigPrefTabPanel"), "hidden", null); enigShowUserModeButtons(gAdvancedMode); } @@ -171,7 +171,7 @@ if ((!window.arguments) || (window.arguments[0].clientType != "seamonkey")) { EnigCollapseAdvanced(document.getElementById("prefTabBox"), "collapsed", null); - EnigCollapseAdvanced(document.getElementById("enigPrefTabPanel"), "hidden", null); + //EnigCollapseAdvanced(document.getElementById("enigPrefTabPanel"), "hidden", null); } // init "saved manual preferences" with current settings: @@ -529,7 +529,7 @@ var prefTabBox = document.getElementById("prefTabBox"); if (prefTabBox) { // Thunderbird - EnigCollapseAdvanced(document.getElementById("enigPrefTabPanel"), "hidden", null); + // EnigCollapseAdvanced(document.getElementById("enigPrefTabPanel"), "hidden", null); EnigCollapseAdvanced(prefTabBox, "collapsed", null); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/pref-enigmail.xul new/enigmail/ui/content/pref-enigmail.xul --- old/enigmail/ui/content/pref-enigmail.xul 2016-02-23 17:26:07.000000000 +0100 +++ new/enigmail/ui/content/pref-enigmail.xul 2016-03-06 13:03:48.000000000 +0100 @@ -447,7 +447,7 @@ </vbox> <!-- Backup/Restore Panel --> - <vbox id="backupRestoreTab"> + <vbox id="backupRestoreTab" flex="1"> <vbox flex="1"> <description>
