Bug 1589850 - Remove unused msgFolderPickerOverlay.xul/dtd. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 30 Oct 2019 19:29:17 +0100
changeset 32349 657fd8bb6fac578f356626d4ffb25344e86c6bf6
parent 32348 8c7fdc016b74e79aeba1369264ea09f4f955ab12
child 32350 a93a71b87c7e1c0f4914e2ac64105e968c8005fb
push id225
push userfrgrahl@gmx.net
push dateWed, 30 Oct 2019 18:44:45 +0000
treeherdercomm-esr60@4f5c19b9a6b7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1589850
Bug 1589850 - Remove unused msgFolderPickerOverlay.xul/dtd. r=frg a=frg
suite/locales/en-US/chrome/mailnews/msgFolderPickerOverlay.dtd
suite/locales/jar.mn
suite/mailnews/content/SearchDialog.xul
suite/mailnews/content/msgFolderPickerOverlay.xul
suite/mailnews/jar.mn
deleted file mode 100644
--- a/suite/locales/en-US/chrome/mailnews/msgFolderPickerOverlay.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- 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/. -->
-
-<!-- Labels -->
-<!ENTITY newfolderchoosethis.label                      "choose this for the parent">
-<!ENTITY filemessageschoosethis.label                   "choose this folder">
--- a/suite/locales/jar.mn
+++ b/suite/locales/jar.mn
@@ -288,17 +288,16 @@
   locale/@AB_CD@/messenger/messengercompose/messengercompose.dtd            (%chrome/mailnews/compose/messengercompose.dtd)
   locale/@AB_CD@/messenger/messengercompose/pref-composing_messages.dtd     (%chrome/mailnews/pref/pref-composing_messages.dtd)
   locale/@AB_CD@/messenger/messengercompose/pref-formatting.dtd             (%chrome/mailnews/pref/pref-formatting.dtd)
   locale/@AB_CD@/messenger/messengercompose/sendProgress.dtd                (%chrome/mailnews/compose/sendProgress.dtd)
   locale/@AB_CD@/messenger/messengercompose/sendProgress.properties         (%chrome/mailnews/compose/sendProgress.properties)
   locale/@AB_CD@/messenger/mime.properties                                  (%chrome/mailnews/mime.properties)
   locale/@AB_CD@/messenger/mimeheader.properties                            (%chrome/mailnews/mimeheader.properties)
   locale/@AB_CD@/messenger/msgAccountCentral.dtd                            (%chrome/mailnews/msgAccountCentral.dtd)
-  locale/@AB_CD@/messenger/msgFolderPickerOverlay.dtd                       (%chrome/mailnews/msgFolderPickerOverlay.dtd)
   locale/@AB_CD@/messenger/msgHdrViewOverlay.dtd                            (%chrome/mailnews/msgHdrViewOverlay.dtd)
   locale/@AB_CD@/messenger/msgHdrViewPopup.dtd                              (%chrome/mailnews/msgHdrViewPopup.dtd)
   locale/@AB_CD@/messenger/msgmdn.properties                                (%chrome/mailnews/msgmdn.properties)
   locale/@AB_CD@/messenger/msgPrintEngine.dtd                               (%chrome/mailnews/msgPrintEngine.dtd)
   locale/@AB_CD@/messenger/msgSynchronize.dtd                               (%chrome/mailnews/msgSynchronize.dtd)
   locale/@AB_CD@/messenger/msgViewPickerOverlay.dtd                         (%chrome/mailnews/msgViewPickerOverlay.dtd)
   locale/@AB_CD@/messenger/newFolderDialog.dtd                              (%chrome/mailnews/newFolderDialog.dtd)
   locale/@AB_CD@/messenger/news.properties                                  (%chrome/mailnews/news.properties)
--- a/suite/mailnews/content/SearchDialog.xul
+++ b/suite/mailnews/content/SearchDialog.xul
@@ -1,18 +1,19 @@
 <?xml version="1.0"?>
 
 <!-- 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/. -->
 <?xml-stylesheet href="chrome://messenger/skin/searchDialog.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
 
 <?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>
-<?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailKeysOverlay.xul"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://messenger/locale/SearchDialog.dtd">
 
 <dialog id="searchMailWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         windowtype="mailnews:search"
@@ -39,16 +40,20 @@
           src="chrome://messenger/content/mailCommands.js"/>
   <script type="application/javascript"
           src="chrome://messenger/content/mailWindowOverlay.js"/>
   <script type="application/javascript"
           src="chrome://messenger/content/commandglue.js"/>
   <script type="application/javascript"
           src="chrome://messenger/content/SearchDialog.js"/>
   <script type="application/javascript"
+          src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
+  <script type="application/javascript"
+          src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript"
           src="chrome://messenger/content/messengerdnd.js"/>
   <script type="application/javascript"
           src="chrome://messenger/content/tabmail.js"/>
   <script type="application/javascript"
           src="chrome://messenger/content/folderDisplay.js"/>
   <script type="application/javascript"
           src="chrome://global/content/contentAreaUtils.js"/>
   <script type="application/javascript"
deleted file mode 100644
--- a/suite/mailnews/content/msgFolderPickerOverlay.xul
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<!-- 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/. -->
-
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
-
-<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/msgFolderPickerOverlay.dtd">
-
-<overlay id="msgFolderPicker"
-         xmlns:nc="http://home.netscape.com/NC-rdf#"
-                 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <stringbundleset id="stringbundleset">
-    <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  </stringbundleset>
-  <script type="application/javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
-  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
-
-    <menulist id="runFiltersFolder"
-              containment="http://home.netscape.com/NC-rdf#child"
-              sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-              sortDirection="ascending"
-              datasources="rdf:msgaccountmanager rdf:mailnewsfolders">
-      <template>
-        <rule nc:NoSelect="false" iscontainer="true" isempty="false">
-          <menupopup>
-              <menu uri="..."
-                class="folderMenuItem menu-iconic"
-                oncommand="PickedMsgFolder(event.target,'runFiltersFolder')"
-                SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
-                BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
-                IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
-                IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
-                ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-                label="rdf:http://home.netscape.com/NC-rdf#Name">
-                <menupopup class="menulist-menupopup">
-                  <menuitem label="&filemessageschoosethis.label;"
-                        oncommand="PickedMsgFolder(event.target.parentNode.parentNode,'runFiltersFolder')"/>
-                  <menuseparator/>
-                </menupopup>
-              </menu>
-          </menupopup>
-       </rule>
-       <rule nc:NoSelect="true" iscontainer="true" isempty="false">
-          <menupopup>
-             <menu uri="..."
-               class="folderMenuItem menu-iconic"
-               oncommand="PickedMsgFolder(event.target,'runFiltersFolder')"
-               SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
-               BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
-               IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
-               IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
-               ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-               label="rdf:http://home.netscape.com/NC-rdf#Name">
-                <menupopup class="menulist-menupopup"/>
-              </menu>
-          </menupopup>
-        </rule>
-        <rule nc:NoSelect="false">
-          <menupopup>
-             <menuitem uri="..." value="..."
-              class="folderMenuItem menuitem-iconic"
-              oncommand="PickedMsgFolder(event.target,'runFiltersFolder')"
-              SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
-              BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
-              IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
-              IsSecure="rdf:http://home.netscape.com/NC-rdf#IsSecure"
-              ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
-              label="rdf:http://home.netscape.com/NC-rdf#Name"/>
-          </menupopup>
-        </rule>
-      </template>
-      <menupopup/>
-    </menulist>
-</overlay>
--- a/suite/mailnews/jar.mn
+++ b/suite/mailnews/jar.mn
@@ -44,17 +44,16 @@ messenger.jar:
     content/messenger/mailWindow.js                                            (content/mailWindow.js)
     content/messenger/mailWindowOverlay.js                                     (content/mailWindowOverlay.js)
     content/messenger/mailWindowOverlay.xul                                    (content/mailWindowOverlay.xul)
     content/messenger/messageWindow.js                                         (content/messageWindow.js)
     content/messenger/messageWindow.xul                                        (content/messageWindow.xul)
     content/messenger/messenger.css                                            (content/messenger.css)
     content/messenger/messenger.xul                                            (content/messenger.xul)
     content/messenger/messengerdnd.js                                          (content/messengerdnd.js)
-    content/messenger/msgFolderPickerOverlay.xul                               (content/msgFolderPickerOverlay.xul)
     content/messenger/msgHdrViewOverlay.js                                     (content/msgHdrViewOverlay.js)
     content/messenger/msgHdrViewOverlay.xul                                    (content/msgHdrViewOverlay.xul)
     content/messenger/msgMail3PaneWindow.js                                    (content/msgMail3PaneWindow.js)
     content/messenger/msgViewNavigation.js                                     (content/msgViewNavigation.js)
     content/messenger/msgViewPickerOverlay.js                                  (content/msgViewPickerOverlay.js)
     content/messenger/nsDragAndDrop.js                                         (content/nsDragAndDrop.js)
     content/messenger/phishingDetector.js                                      (content/phishingDetector.js)
     content/messenger/searchBar.js                                             (content/searchBar.js)