Hello community, here is the log from the commit of package enigmail for openSUSE:Factory checked in at 2018-06-02 12:14:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/enigmail (Old) and /work/SRC/openSUSE:Factory/.enigmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enigmail" Sat Jun 2 12:14:05 2018 rev:27 rq:613431 version:2.0.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/enigmail/enigmail.changes 2018-05-29 10:48:58.479515672 +0200 +++ /work/SRC/openSUSE:Factory/.enigmail.new/enigmail.changes 2018-06-02 12:14:28.318876064 +0200 @@ -1,0 +2,8 @@ +Fri Jun 1 08:04:05 UTC 2018 - [email protected] + +- enigmail 2.0.6.1: + * fix compatibility issue with Thunderbird 60b7 + * disallow plaintext (literal packets) outside of encrpyted + packets + +------------------------------------------------------------------- Old: ---- enigmail-2.0.6.tar.gz enigmail-2.0.6.tar.gz.asc New: ---- enigmail-2.0.6.1.tar.gz enigmail-2.0.6.1.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ enigmail.spec ++++++ --- /var/tmp/diff_new_pack.P0k6SQ/_old 2018-06-02 12:14:30.026813418 +0200 +++ /var/tmp/diff_new_pack.P0k6SQ/_new 2018-06-02 12:14:30.030813271 +0200 @@ -18,7 +18,7 @@ Name: enigmail -Version: 2.0.6 +Version: 2.0.6.1 Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-2.0 ++++++ enigmail-2.0.6.tar.gz -> enigmail-2.0.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/Makefile new/enigmail/Makefile --- old/enigmail/Makefile 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/Makefile 2018-05-30 18:17:44.000000000 +0200 @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPI_MODULE = enigmail -XPI_MODULE_VERS = 2.0.6 +XPI_MODULE_VERS = 2.0.6.1 DEPTH = . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/configure new/enigmail/configure --- old/enigmail/configure 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/configure 2018-05-30 18:17:44.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for enigmail 2.0.6. +# Generated by GNU Autoconf 2.69 for enigmail 2.0.6.1. # # Report bugs to <https://www.enigmail.net>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='enigmail' PACKAGE_TARNAME='enigmail' -PACKAGE_VERSION='2.0.6' -PACKAGE_STRING='enigmail 2.0.6' +PACKAGE_VERSION='2.0.6.1' +PACKAGE_STRING='enigmail 2.0.6.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 2.0.6 to adapt to many kinds of systems. +\`configure' configures enigmail 2.0.6.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 2.0.6:";; + short | recursive ) echo "Configuration of enigmail 2.0.6.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 2.0.6 +enigmail configure 2.0.6.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 2.0.6, which was +It was created by enigmail $as_me 2.0.6.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/configure.ac new/enigmail/configure.ac --- old/enigmail/configure.ac 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/configure.ac 2018-05-30 18:17:44.000000000 +0200 @@ -2,7 +2,7 @@ AC_PREREQ(2.61) min_automake_version="1.10" -AC_INIT([enigmail],[2.0.6], [https://www.enigmail.net]) +AC_INIT([enigmail],[2.0.6.1], [https://www.enigmail.net]) AC_PATH_PROG(PYTHON, "python2") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/commandLine.jsm new/enigmail/package/commandLine.jsm --- old/enigmail/package/commandLine.jsm 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/package/commandLine.jsm 2018-05-30 18:17:44.000000000 +0200 @@ -22,7 +22,6 @@ const nsICommandLineHandler = Ci.nsICommandLineHandler; const nsIFactory = Ci.nsIFactory; -const nsISupports = Ci.nsISupports; function Handler() {} @@ -30,7 +29,7 @@ classDescription: "Enigmail Key Management CommandLine Service", classID: NS_ENIGCLINE_SERVICE_CID, contractID: NS_CLINE_SERVICE_CONTRACTID, - QueryInterface: XPCOMUtils.generateQI([nsICommandLineHandler, nsIFactory, nsISupports]), + QueryInterface: XPCOMUtils.generateQI([nsICommandLineHandler, nsIFactory]), // nsICommandLineHandler handle: function(cmdLine) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/core.jsm new/enigmail/package/core.jsm --- old/enigmail/package/core.jsm 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/package/core.jsm 2018-05-30 18:17:44.000000000 +0200 @@ -47,7 +47,6 @@ // Interfaces -const nsISupports = Ci.nsISupports; const nsIEnvironment = Ci.nsIEnvironment; var gPreferredGpgPath = null; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/errorHandling.jsm new/enigmail/package/errorHandling.jsm --- old/enigmail/package/errorHandling.jsm 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/package/errorHandling.jsm 2018-05-30 18:17:44.000000000 +0200 @@ -431,14 +431,19 @@ function detectForgedInsets(c) { // detect forged message insets + let hasUnencryptedText = false; + let hasEncryptedPart = false; for (var j = 0; j < c.statusArray.length; j++) { if (c.statusArray[j].search(c.cryptoStartPat) === 0) { c.withinCryptoMsg = true; + hasEncryptedPart = true; } else if (c.withinCryptoMsg && c.statusArray[j].search(c.cryptoEndPat) === 0) { c.withinCryptoMsg = false; } else if (c.statusArray[j].search(c.plaintextPat) === 0) { + if (!c.withinCryptoMsg) hasUnencryptedText = true; + ++c.plaintextCount; if ((c.statusArray.length > j + 1) && (c.statusArray[j + 1].search(c.plaintextLengthPat) === 0)) { var matches = c.statusArray[j + 1].match(/(\w+) (\d+)/); @@ -452,8 +457,8 @@ } } } - if (c.plaintextCount > 1) { - c.statusFlags |= (EnigmailConstants.PARTIALLY_PGP | EnigmailConstants.DECRYPTION_FAILED | EnigmailConstants.BAD_SIGNATURE); + if (c.plaintextCount > 1 || (hasEncryptedPart && hasUnencryptedText)) { + c.statusFlags |= (EnigmailConstants.DECRYPTION_FAILED | EnigmailConstants.BAD_SIGNATURE); } } 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 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/package/install.rdf 2018-05-30 18:17:44.000000000 +0200 @@ -5,7 +5,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{847b3a00-7ab1-11d4-8f02-006008948af5}</em:id> - <em:version>2.0.6</em:version> + <em:version>2.0.6.1</em:version> <em:type>2</em:type> <!-- type = extension --> <em:bootstrap>true</em:bootstrap> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/installGnuPG.jsm new/enigmail/package/installGnuPG.jsm --- old/enigmail/package/installGnuPG.jsm 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/package/installGnuPG.jsm 2018-05-30 18:17:44.000000000 +0200 @@ -329,7 +329,7 @@ // use runwAsync in order to get UAC approval on Windows 7 / 8 if required var obs = { - QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver, Ci.nsISupports]), + QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver]), observe: function(proc, aTopic, aData) { EnigmailLog.DEBUG("installGnuPG.jsm: installWindows.observe: topic='" + aTopic + "' \n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/msgCompFields.jsm new/enigmail/package/msgCompFields.jsm --- old/enigmail/package/msgCompFields.jsm 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/package/msgCompFields.jsm 2018-05-30 18:17:44.000000000 +0200 @@ -112,8 +112,7 @@ QueryInterface: XPCOMUtils.generateQI([ Ci.nsIMsgSearchValue, // we abuse nsIMsgSearchValue as we cannot create a custom QueryInterface anymore Ci.nsIMsgSMIMECompFields, - Ci.nsIMsgCompFields, - Ci.nsISupports + Ci.nsIMsgCompFields ]), toString: function() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/package/socks5Proxy.jsm new/enigmail/package/socks5Proxy.jsm --- old/enigmail/package/socks5Proxy.jsm 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/package/socks5Proxy.jsm 2018-05-30 18:17:44.000000000 +0200 @@ -69,7 +69,7 @@ applyFilter: function(proxyService, uri, proxyInfo) { return proxyService.newProxyInfo("socks", getEnigmailPrefs().getPref(TOR_IP_ADDR_PREF), port, CONNECTION_FLAGS, SECONDS_TO_WAIT_FOR_CONNECTION, failoverProxy); }, - QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolProxyFilter, Ci.nsISupports]) + QueryInterface: XPCOMUtils.generateQI([Ci.nsIProtocolProxyFilter]) }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/autocryptInitiateBackup.xul new/enigmail/ui/content/autocryptInitiateBackup.xul --- old/enigmail/ui/content/autocryptInitiateBackup.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/autocryptInitiateBackup.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/autocryptSetupPasswd.xul new/enigmail/ui/content/autocryptSetupPasswd.xul --- old/enigmail/ui/content/autocryptSetupPasswd.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/autocryptSetupPasswd.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/editSingleAccount.xul new/enigmail/ui/content/editSingleAccount.xul --- old/enigmail/ui/content/editSingleAccount.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/editSingleAccount.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigRetrieveProgress.xul new/enigmail/ui/content/enigRetrieveProgress.xul --- old/enigmail/ui/content/enigRetrieveProgress.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigRetrieveProgress.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailAddUidDlg.xul new/enigmail/ui/content/enigmailAddUidDlg.xul --- old/enigmail/ui/content/enigmailAddUidDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailAddUidDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailAdvancedIdentityDlg.xul new/enigmail/ui/content/enigmailAdvancedIdentityDlg.xul --- old/enigmail/ui/content/enigmailAdvancedIdentityDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailAdvancedIdentityDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -6,7 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailAttachmentsDialog.xul new/enigmail/ui/content/enigmailAttachmentsDialog.xul --- old/enigmail/ui/content/enigmailAttachmentsDialog.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailAttachmentsDialog.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailCardDetails.xul new/enigmail/ui/content/enigmailCardDetails.xul --- old/enigmail/ui/content/enigmailCardDetails.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailCardDetails.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailConsole.xul new/enigmail/ui/content/enigmailConsole.xul --- old/enigmail/ui/content/enigmailConsole.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailConsole.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,7 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <?xul-overlay href="chrome://global/content/globalOverlay.xul"?> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailDispPhoto.xul new/enigmail/ui/content/enigmailDispPhoto.xul --- old/enigmail/ui/content/enigmailDispPhoto.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailDispPhoto.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailEditKeyExpiryDlg.xul new/enigmail/ui/content/enigmailEditKeyExpiryDlg.xul --- old/enigmail/ui/content/enigmailEditKeyExpiryDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailEditKeyExpiryDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -6,11 +6,11 @@ --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ - <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > + <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailEditKeyTrustDlg.xul new/enigmail/ui/content/enigmailEditKeyTrustDlg.xul --- old/enigmail/ui/content/enigmailEditKeyTrustDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailEditKeyTrustDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -6,11 +6,11 @@ --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailEncryptionDlg.xul new/enigmail/ui/content/enigmailEncryptionDlg.xul --- old/enigmail/ui/content/enigmailEncryptionDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailEncryptionDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailGenCardKey.xul new/enigmail/ui/content/enigmailGenCardKey.xul --- old/enigmail/ui/content/enigmailGenCardKey.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailGenCardKey.xul 2018-05-30 18:17:44.000000000 +0200 @@ -6,11 +6,11 @@ --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailImportPhoto.xul new/enigmail/ui/content/enigmailImportPhoto.xul --- old/enigmail/ui/content/enigmailImportPhoto.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailImportPhoto.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailKeyImportInfo.xul new/enigmail/ui/content/enigmailKeyImportInfo.xul --- old/enigmail/ui/content/enigmailKeyImportInfo.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailKeyImportInfo.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailKeyManager.xul new/enigmail/ui/content/enigmailKeyManager.xul --- old/enigmail/ui/content/enigmailKeyManager.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailKeyManager.xul 2018-05-30 18:17:44.000000000 +0200 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!-- @@ -14,7 +14,7 @@ <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?> <!DOCTYPE window [ - <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > + <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailKeySelection.xul new/enigmail/ui/content/enigmailKeySelection.xul --- old/enigmail/ui/content/enigmailKeySelection.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailKeySelection.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailKeyserverDlg.xul new/enigmail/ui/content/enigmailKeyserverDlg.xul --- old/enigmail/ui/content/enigmailKeyserverDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailKeyserverDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailManageUidDlg.xul new/enigmail/ui/content/enigmailManageUidDlg.xul --- old/enigmail/ui/content/enigmailManageUidDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailManageUidDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailMsgBox.xul new/enigmail/ui/content/enigmailMsgBox.xul --- old/enigmail/ui/content/enigmailMsgBox.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailMsgBox.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailRulesEditor.xul new/enigmail/ui/content/enigmailRulesEditor.xul --- old/enigmail/ui/content/enigmailRulesEditor.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailRulesEditor.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSearchKey.xul new/enigmail/ui/content/enigmailSearchKey.xul --- old/enigmail/ui/content/enigmailSearchKey.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailSearchKey.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSelectRule.xul new/enigmail/ui/content/enigmailSelectRule.xul --- old/enigmail/ui/content/enigmailSelectRule.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailSelectRule.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSetCardPin.xul new/enigmail/ui/content/enigmailSetCardPin.xul --- old/enigmail/ui/content/enigmailSetCardPin.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailSetCardPin.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSetupWizard.xul new/enigmail/ui/content/enigmailSetupWizard.xul --- old/enigmail/ui/content/enigmailSetupWizard.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailSetupWizard.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSignKeyDlg.xul new/enigmail/ui/content/enigmailSignKeyDlg.xul --- old/enigmail/ui/content/enigmailSignKeyDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailSignKeyDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailSingleRcptSettings.xul new/enigmail/ui/content/enigmailSingleRcptSettings.xul --- old/enigmail/ui/content/enigmailSingleRcptSettings.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailSingleRcptSettings.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/enigmailWrapSelection.xul new/enigmail/ui/content/enigmailWrapSelection.xul --- old/enigmail/ui/content/enigmailWrapSelection.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/enigmailWrapSelection.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/exportSettingsWizard.xul new/enigmail/ui/content/exportSettingsWizard.xul --- old/enigmail/ui/content/exportSettingsWizard.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/exportSettingsWizard.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/keyDetailsDlg.xul new/enigmail/ui/content/keyDetailsDlg.xul --- old/enigmail/ui/content/keyDetailsDlg.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/keyDetailsDlg.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/pepHandshake.xul new/enigmail/ui/content/pepHandshake.xul --- old/enigmail/ui/content/pepHandshake.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/pepHandshake.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/pepPrepHandshake.xul new/enigmail/ui/content/pepPrepHandshake.xul --- old/enigmail/ui/content/pepPrepHandshake.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/pepPrepHandshake.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/pepTrustWords.xul new/enigmail/ui/content/pepTrustWords.xul --- old/enigmail/ui/content/pepTrustWords.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/pepTrustWords.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; 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 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/pref-enigmail.xul 2018-05-30 18:17:44.000000000 +0200 @@ -6,11 +6,11 @@ --> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/enigmail/ui/content/pref-pep.xul new/enigmail/ui/content/pref-pep.xul --- old/enigmail/ui/content/pref-pep.xul 2018-05-27 11:50:32.000000000 +0200 +++ new/enigmail/ui/content/pref-pep.xul 2018-05-30 18:17:44.000000000 +0200 @@ -5,11 +5,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> <?xml-stylesheet href="chrome://enigmail/skin/enigmail.css" type="text/css"?> <!DOCTYPE window [ -<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" > +<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD; <!ENTITY % enigMailDTD SYSTEM "chrome://enigmail/locale/enigmail.dtd" > %enigMailDTD;
