Backed out changeset 10abecc1ae80
authorKai Engert <kaie@kuix.de>
Wed, 27 Nov 2019 21:02:26 +0100
changeset 36742 beec6bc7dc921e59d67f4bd576b13d03f03e5c2a
parent 36741 b8e5b419b13691d345f66b04ab3a936b9a0c4bea
child 36743 44a47f85aade5ac888d0215c28d193fcb68b95fd
push id2534
push userclokep@gmail.com
push dateMon, 02 Dec 2019 19:52:51 +0000
treeherdercomm-beta@055c50840778 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
backs out10abecc1ae80917bc510391bdaa96060e8401440
Backed out changeset 10abecc1ae80
mail/base/content/messageWindow.xul
mail/base/content/messenger.xul
mail/base/content/msgHdrPopup.inc.xul
mail/base/content/msgHdrView.js
mail/base/modules/MailConstants.jsm
mail/base/modules/moz.build
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -37,20 +37,16 @@
 <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityDTD;
 <!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetMenu.dtd">
 %charsetDTD;
 <!ENTITY % viewZoomOverlayDTD SYSTEM "chrome://messenger/locale/viewZoomOverlay.dtd">
 %viewZoomOverlayDTD;
 <!ENTITY % msgReadSMIMEDTD SYSTEM "chrome://messenger-smime/locale/msgReadSMIMEOverlay.dtd">
 %msgReadSMIMEDTD;
-#ifdef MOZ_OPENPGP
-<!ENTITY % bondOpenPGPDTD SYSTEM "chrome://openpgp/content/strings/bond.dtd">
-%bondOpenPGPDTD;
-#endif
 <!ENTITY % quickFilterBarDTD SYSTEM "chrome://messenger/locale/quickFilterBar.dtd">
 %quickFilterBarDTD;
 <!ENTITY % msgViewPickerDTD SYSTEM "chrome://messenger/locale/msgViewPickerOverlay.dtd" >
 %msgViewPickerDTD;
 ]>
 
 <!--
   - This window displays a single message.
@@ -98,21 +94,16 @@
   <script src="chrome://communicator/content/contentAreaClick.js"/>
   <script src="chrome://global/content/nsDragAndDrop.js"/>
   <script src="chrome://messenger/content/msgViewNavigation.js"/>
   <script src="chrome://messenger/content/editContactPanel.js"/>
   <script src="chrome://messenger/content/toolbarIconColor.js"/>
   <script src="chrome://messenger/content/msgHdrView.js"/>
   <script src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
   <script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
-#ifdef MOZ_OPENPGP
-  <script src="chrome://openpgp/content/bond.js"/>
-  <script src="chrome://openpgp/content/ui/enigmailMessengerOverlay.js"/>
-  <script src="chrome://openpgp/content/ui/enigmailMsgHdrViewOverlay.js"/>
-#endif
   <script src="chrome://messenger/content/mailCommands.js"/>
   <script src="chrome://messenger/content/junkCommands.js"/>
   <script src="chrome://messenger/content/mailWindowOverlay.js"/>
   <script src="chrome://messenger/content/mailTabs.js"/>
   <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
   <script src="chrome://messenger/content/mail-offline.js"/>
   <script src="chrome://global/content/printUtils.js"/>
   <script src="chrome://messenger/content/msgViewPickerOverlay.js"/>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -131,18 +131,16 @@
 <script src="chrome://messenger/content/toolbarIconColor.js"/>
 <script src="chrome://messenger/content/jsTreeView.js"/>
 <script src="chrome://messenger/content/msgHdrView.js"/>
 <script src="chrome://global/content/nsDragAndDrop.js"/>
 <script src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
 <script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
 #ifdef MOZ_OPENPGP
 <script src="chrome://openpgp/content/bond.js"/>
-<script src="chrome://openpgp/content/ui/enigmailMessengerOverlay.js"/>
-<script src="chrome://openpgp/content/ui/enigmailMsgHdrViewOverlay.js"/>
 #endif
 <script src="chrome://messenger/content/chat/chat-messenger.js"/>
 <script src="chrome://messenger/content/chat/imStatusSelector.js"/>
 <script src="chrome://messenger/content/chat/imContextMenu.js"/>
 <script src="chrome://messenger/content/chat/chat-conversation.js"/>
 <script src="chrome://messenger/content/preferences/preferencesTab.js"/>
 <script src="chrome://messenger/content/mailCore.js"/>
 <script src="chrome://messenger/content/mailCommands.js"/>
--- a/mail/base/content/msgHdrPopup.inc.xul
+++ b/mail/base/content/msgHdrPopup.inc.xul
@@ -53,19 +53,16 @@
 #ifdef XP_MACOSX
               label="&detachedAttachmentFolder.showMac.label;"
               accesskey="&detachedAttachmentFolder.showMac.accesskey;"
 #else
               label="&detachedAttachmentFolder.show.label;"
               accesskey="&detachedAttachmentFolder.show.accesskey;"
 #endif
               oncommand="HandleMultipleAttachments(this.parentNode.attachments, 'openFolder');"/>
-#ifdef MOZ_OPENPGP
-#include ../../extensions/openpgp/content/ui/attachmentItemContext.inc.xul
-#endif
   </menupopup>
 
   <menupopup id="attachmentListContext"
              onpopupshowing="goUpdateAttachmentCommands();">
     <menuitem id="context-openAllAttachments"
               label="&openAllAttachmentsCmd.label;"
               accesskey="&openAllAttachmentsCmd.accesskey;"
               command="cmd_openAllAttachments"/>
--- a/mail/base/content/msgHdrView.js
+++ b/mail/base/content/msgHdrView.js
@@ -11,19 +11,16 @@
 /* import-globals-from folderDisplay.js */
 /* import-globals-from mailWindow.js */
 /* import-globals-from messageDisplay.js */
 /* import-globals-from nsDragAndDrop.js */
 
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-var { MailConstants } = ChromeUtils.import(
-  "resource:///modules/MailConstants.jsm"
-);
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { DisplayNameUtils } = ChromeUtils.import(
   "resource:///modules/DisplayNameUtils.jsm"
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { GlodaUtils } = ChromeUtils.import("resource:///modules/gloda/utils.js");
@@ -2296,20 +2293,16 @@ function onShowAttachmentItemContextMenu
   saveMenu.disabled = allSelectedDeleted;
   detachMenu.disabled = !canDetachSelected;
   deleteMenu.disabled = !canDetachSelected;
   copyUrlMenuSep.hidden = copyUrlMenu.hidden = !(
     allSelectedHttp || allSelectedFile
   );
   openFolderMenu.hidden = !allSelectedFile;
   openFolderMenu.disabled = allSelectedDeleted;
-
-  if (MailConstants.MOZ_OPENPGP) {
-    Enigmail.hdrView.onShowAttachmentContextMenu();
-  }
 }
 
 /**
  * Close the attachment item context menu, performing any cleanup as necessary.
  */
 function onHideAttachmentItemContextMenu() {
   let attachmentName = document.getElementById("attachmentName");
   let contextMenu = document.getElementById("attachmentItemContext");
deleted file mode 100644
--- a/mail/base/modules/MailConstants.jsm
+++ /dev/null
@@ -1,20 +0,0 @@
-#filter substitution
-/* 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/. */
-
-"use strict";
-
-var EXPORTED_SYMBOLS = ["MailConstants"];
-
-// Immutable for export.
-var MailConstants = Object.freeze({
-
-  MOZ_OPENPGP:
-#ifdef MOZ_OPENPGP
-  true,
-#else
-  false,
-#endif
-
-});
--- a/mail/base/modules/moz.build
+++ b/mail/base/modules/moz.build
@@ -21,20 +21,16 @@ EXTRA_JS_MODULES += [
     'SearchSpec.jsm',
     'SessionStoreManager.jsm',
     'SummaryFrameManager.jsm',
     'TagUtils.jsm',
     'TBDistCustomizer.jsm',
     'Windows8WindowFrameColor.jsm',
 ]
 
-EXTRA_PP_JS_MODULES += [
-    'MailConstants.jsm',
-]
-
 if CONFIG['MOZ_UPDATER']:
     EXTRA_JS_MODULES += [
         'AppUpdateUI.jsm',
     ]
 
 FINAL_TARGET_FILES.modules += [
     'ThemeVariableMap.jsm'
 ]