Bug 1502793 - remove shareglue.js which is dead code. r=jorgk
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Mon, 29 Oct 2018 09:15:07 +0200
changeset 33610 5bf8cf04b0042058f13bffad5827b38473ae8155
parent 33609 29f023e0da21005225cc793b93e50a95cf6d0575
child 33611 50073ff4e729fd9577957ad8ad2d7b71b8bb0dfc
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1502793
Bug 1502793 - remove shareglue.js which is dead code. r=jorgk
mail/base/content/hiddenWindow.xul
mail/base/content/messageWindow.xul
mail/base/content/messenger.xul
mailnews/base/content/shareglue.js
mailnews/jar.mn
--- a/mail/base/content/hiddenWindow.xul
+++ b/mail/base/content/hiddenWindow.xul
@@ -32,17 +32,16 @@
 
 <window id="hidden-window"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="hiddenWindowStartup();">
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
 <script type="application/javascript" src="chrome://messenger/content/searchBar.js"/>
 <script type="application/javascript" src="chrome://messenger/content/hiddenWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
 <script type="application/javascript" src="chrome://messenger/content/junkCommands.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
--- a/mail/base/content/messageWindow.xul
+++ b/mail/base/content/messageWindow.xul
@@ -76,17 +76,16 @@
     <stringbundle id="bundle_read_smime" src="chrome://messenger-smime/locale/msgReadSMIMEOverlay.properties"/>
   </stringbundleset>
 
   <linkset>
     <link rel="localization" href="toolkit/main-window/findbar.ftl"/>
   </linkset>
 
   <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
   <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
   <script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
   <script type="application/javascript" src="chrome://messenger/content/messageDisplay.js"/>
   <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
   <script type="application/javascript" src="chrome://messenger/content/messageWindow.js"/>
   <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
   <script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
   <script type="application/javascript" src="chrome://messenger/content/nsContextMenu.js"/>
--- a/mail/base/content/messenger.xul
+++ b/mail/base/content/messenger.xul
@@ -95,17 +95,16 @@
 </stringbundleset>
 
 <linkset>
   <link rel="localization" href="toolkit/main-window/findbar.ftl"/>
 </linkset>
 
 <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
 <script type="application/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/mail-compacttheme.js"/>
 <script type="application/javascript" src="chrome://messenger/content/selectionsummaries.js"/>
 <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
 <script type="application/javascript" src="chrome://messenger/content/specialTabs.js"/>
 <!-- accountProvisionerTab.js relies on code from specialTabs.js, and so much be loaded after it. -->
 <script type="application/javascript" src="chrome://messenger/content/newmailaccount/accountProvisionerTab.js"/>
deleted file mode 100644
--- a/mailnews/base/content/shareglue.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * 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/. */
-
-/*
- * code in here is generic, shared utility code across all messenger
- * components. There should be no command or widget specific code here
- */
-
-function MessengerSetForcedCharacterSet(aCharset)
-{
-  messenger.setDocumentCharset(aCharset);
-  msgWindow.mailCharacterSet = aCharset;
-  msgWindow.charsetOverride = true;
-
-  // DO NOT try to reload the message here. we do this automatically now in
-  //  messenger.SetDocumentCharset. You'll just break things and reak havoc
-  // if you call ReloadMessage() here...
-}
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -77,17 +77,16 @@ messenger.jar:
     content/messenger/newFolderDialog.xul                                      (base/content/newFolderDialog.xul)
     content/messenger/newFolderDialog.js                                       (base/content/newFolderDialog.js)
 *   content/messenger/msgAccountCentral.xul                                    (base/content/msgAccountCentral.xul)
     content/messenger/msgAccountCentral.js                                     (base/content/msgAccountCentral.js)
     content/messenger/msgFolderPickerOverlay.js                                (base/content/msgFolderPickerOverlay.js)
     content/messenger/renameFolderDialog.xul                                   (base/content/renameFolderDialog.xul)
     content/messenger/renameFolderDialog.js                                    (base/content/renameFolderDialog.js)
     content/messenger/retention.js                                             (base/content/retention.js)
-    content/messenger/shareglue.js                                             (base/content/shareglue.js)
     content/messenger/subscribe.js                                             (base/content/subscribe.js)
 *   content/messenger/subscribe.xul                                            (base/content/subscribe.xul)
     content/messenger/virtualFolderListEdit.xul                                (base/content/virtualFolderListEdit.xul)
     content/messenger/virtualFolderListEdit.js                                 (base/content/virtualFolderListEdit.js)
 *   content/messenger/virtualFolderProperties.xul                              (base/content/virtualFolderProperties.xul)
     content/messenger/virtualFolderProperties.js                               (base/content/virtualFolderProperties.js)
     content/messenger/msgPrintEngine.js                                        (base/content/msgPrintEngine.js)
     content/messenger/msgPrintEngine.xul                                       (base/content/msgPrintEngine.xul)