From 724fc731ac789033bcddfbe27596fdf45e4223ba Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 25 Mar 2021 21:32:38 +0000 Subject: [PATCH] [Pale-Moon] Issue #1865 - Remove unused overlays and unnecessary preprocessing --- .../base/content/browserMountPoints.inc | 12 ---- .../base/content/downloadManagerOverlay.xul | 32 --------- .../base/content/jsConsoleOverlay.xul | 18 ----- .../base/content/macBrowserOverlay.xul | 67 ------------------- .../base/content/softwareUpdateOverlay.xul | 18 ----- application/palemoon/base/jar.mn | 14 ++-- .../palemoon/components/downloads/jar.mn | 10 +-- .../palemoon/components/pageinfo/jar.mn | 2 +- application/palemoon/components/places/jar.mn | 12 ++-- .../palemoon/components/preferences/jar.mn | 14 ++-- .../components/privatebrowsing/jar.mn | 2 +- application/palemoon/components/search/jar.mn | 2 +- .../palemoon/components/sessionstore/jar.mn | 2 +- application/palemoon/components/shell/jar.mn | 2 +- 14 files changed, 30 insertions(+), 177 deletions(-) delete mode 100644 application/palemoon/base/content/browserMountPoints.inc delete mode 100644 application/palemoon/base/content/downloadManagerOverlay.xul delete mode 100644 application/palemoon/base/content/jsConsoleOverlay.xul delete mode 100644 application/palemoon/base/content/macBrowserOverlay.xul delete mode 100644 application/palemoon/base/content/softwareUpdateOverlay.xul diff --git a/application/palemoon/base/content/browserMountPoints.inc b/application/palemoon/base/content/browserMountPoints.inc deleted file mode 100644 index e4315b04a8..0000000000 --- a/application/palemoon/base/content/browserMountPoints.inc +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/application/palemoon/base/content/downloadManagerOverlay.xul b/application/palemoon/base/content/downloadManagerOverlay.xul deleted file mode 100644 index 9987820cb9..0000000000 --- a/application/palemoon/base/content/downloadManagerOverlay.xul +++ /dev/null @@ -1,32 +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/. - - - - - - - -#include browserMountPoints.inc - - - - - - diff --git a/application/palemoon/base/content/jsConsoleOverlay.xul b/application/palemoon/base/content/jsConsoleOverlay.xul deleted file mode 100644 index 1bc518d4f8..0000000000 --- a/application/palemoon/base/content/jsConsoleOverlay.xul +++ /dev/null @@ -1,18 +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/. - - - - - - - -#include browserMountPoints.inc - - - - diff --git a/application/palemoon/base/content/macBrowserOverlay.xul b/application/palemoon/base/content/macBrowserOverlay.xul deleted file mode 100644 index b1ae838d0f..0000000000 --- a/application/palemoon/base/content/macBrowserOverlay.xul +++ /dev/null @@ -1,67 +0,0 @@ - -# -*- Mode: HTML -*- -# -# 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/. - - - - - - - - -# All DTD information is stored in a separate file so that it can be shared by -# hiddenWindow.xul. -#include browser-doctype.inc - - - -# All JS files which are not content (only) dependent that browser.xul -# wishes to include *must* go into the global-scripts.inc file -# so that they can be shared by this overlay. -#include global-scripts.inc -#ifdef MOZ_DEVTOOLS -#include global-devtools-theme-scripts.inc -#endif - - - -# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the -# browser-sets.inc file for sharing with hiddenWindow.xul. -#include browser-sets.inc - -# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by -# hiddenWindow.xul. -#include browser-menubar.inc - - - - - - - - - - - diff --git a/application/palemoon/base/content/softwareUpdateOverlay.xul b/application/palemoon/base/content/softwareUpdateOverlay.xul deleted file mode 100644 index 01170e46c3..0000000000 --- a/application/palemoon/base/content/softwareUpdateOverlay.xul +++ /dev/null @@ -1,18 +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/. - - - - - - - -#include browserMountPoints.inc - - - - diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn index 18b7e7144c..ef6d02c486 100644 --- a/application/palemoon/base/jar.mn +++ b/application/palemoon/base/jar.mn @@ -11,7 +11,7 @@ browser.jar: % style chrome://global/content/customizeToolbar.xul chrome://browser/content/browser.css % style chrome://global/content/customizeToolbar.xul chrome://browser/skin/ * content/browser/aboutDialog.xul (content/aboutDialog.xul) -* content/browser/aboutDialog.js (content/aboutDialog.js) + content/browser/aboutDialog.js (content/aboutDialog.js) content/browser/aboutDialog.css (content/aboutDialog.css) content/browser/autorecovery.js (content/autorecovery.js) content/browser/autorecovery.xul (content/autorecovery.xul) @@ -24,7 +24,7 @@ browser.jar: #ifdef MOZ_DEVTOOLS content/browser/browser-devtools-theme.js (content/browser-devtools-theme.js) #endif -* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) + content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) content/browser/content.js (content/content.js) content/browser/padlock.xul (content/padlock.xul) content/browser/padlock.js (content/padlock.js) @@ -45,23 +45,23 @@ browser.jar: content/browser/safeMode.css (content/safeMode.css) content/browser/safeMode.js (content/safeMode.js) * content/browser/safeMode.xul (content/safeMode.xul) -* content/browser/sanitize.js (content/sanitize.js) + content/browser/sanitize.js (content/sanitize.js) * content/browser/sanitize.xul (content/sanitize.xul) * content/browser/sanitizeDialog.js (content/sanitizeDialog.js) content/browser/sanitizeDialog.css (content/sanitizeDialog.css) content/browser/autocomplete.css (content/autocomplete.css) -* content/browser/autocomplete.xml (content/autocomplete.xml) + content/browser/autocomplete.xml (content/autocomplete.xml) content/browser/tabbrowser.css (content/tabbrowser.css) * content/browser/tabbrowser.xml (content/tabbrowser.xml) -* content/browser/urlbarBindings.xml (content/urlbarBindings.xml) + content/browser/urlbarBindings.xml (content/urlbarBindings.xml) * content/browser/utilityOverlay.js (content/utilityOverlay.js) content/browser/web-panels.js (content/web-panels.js) * content/browser/web-panels.xul (content/web-panels.xul) * content/browser/baseMenuOverlay.xul (content/baseMenuOverlay.xul) * content/browser/nsContextMenu.js (content/nsContextMenu.js) # XXX: We should exclude this one as well (bug 71895) -* content/browser/hiddenWindow.xul (content/hiddenWindow.xul) -* content/browser/viewSourceOverlay.xul (content/viewSourceOverlay.xul) + content/browser/hiddenWindow.xul (content/hiddenWindow.xul) + content/browser/viewSourceOverlay.xul (content/viewSourceOverlay.xul) #ifdef XP_WIN content/browser/win6BrowserOverlay.xul (content/win6BrowserOverlay.xul) #endif diff --git a/application/palemoon/components/downloads/jar.mn b/application/palemoon/components/downloads/jar.mn index 8f8c66dd7f..7b10ee9a70 100644 --- a/application/palemoon/components/downloads/jar.mn +++ b/application/palemoon/components/downloads/jar.mn @@ -3,16 +3,16 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. browser.jar: -* content/browser/downloads/download.xml (content/download.xml) + content/browser/downloads/download.xml (content/download.xml) content/browser/downloads/download.css (content/download.css) content/browser/downloads/downloads.css (content/downloads.css) -* content/browser/downloads/downloads.js (content/downloads.js) -* content/browser/downloads/downloadsOverlay.xul (content/downloadsOverlay.xul) + content/browser/downloads/downloads.js (content/downloads.js) + content/browser/downloads/downloadsOverlay.xul (content/downloadsOverlay.xul) content/browser/downloads/indicator.js (content/indicator.js) content/browser/downloads/indicatorOverlay.xul (content/indicatorOverlay.xul) -* content/browser/downloads/allDownloadsViewOverlay.xul (content/allDownloadsViewOverlay.xul) + content/browser/downloads/allDownloadsViewOverlay.xul (content/allDownloadsViewOverlay.xul) content/browser/downloads/allDownloadsViewOverlay.js (content/allDownloadsViewOverlay.js) content/browser/downloads/allDownloadsViewOverlay.css (content/allDownloadsViewOverlay.css) -* content/browser/downloads/contentAreaDownloadsView.xul (content/contentAreaDownloadsView.xul) + content/browser/downloads/contentAreaDownloadsView.xul (content/contentAreaDownloadsView.xul) content/browser/downloads/contentAreaDownloadsView.js (content/contentAreaDownloadsView.js) content/browser/downloads/contentAreaDownloadsView.css (content/contentAreaDownloadsView.css) diff --git a/application/palemoon/components/pageinfo/jar.mn b/application/palemoon/components/pageinfo/jar.mn index 229f991682..c0c947ffe4 100644 --- a/application/palemoon/components/pageinfo/jar.mn +++ b/application/palemoon/components/pageinfo/jar.mn @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. browser.jar: -* content/browser/pageinfo/pageInfo.xul + content/browser/pageinfo/pageInfo.xul content/browser/pageinfo/pageInfo.js content/browser/pageinfo/pageInfo.css content/browser/pageinfo/pageInfo.xml diff --git a/application/palemoon/components/places/jar.mn b/application/palemoon/components/places/jar.mn index 41222e156c..77d05663a6 100644 --- a/application/palemoon/components/places/jar.mn +++ b/application/palemoon/components/places/jar.mn @@ -8,27 +8,27 @@ browser.jar: # attributes separately content/browser/places/bookmarkProperties2.xul (content/bookmarkProperties.xul) * content/browser/places/places.xul (content/places.xul) -* content/browser/places/places.js (content/places.js) + content/browser/places/places.js (content/places.js) content/browser/places/places.css (content/places.css) content/browser/places/organizer.css (content/organizer.css) content/browser/places/bookmarkProperties.xul (content/bookmarkProperties.xul) content/browser/places/bookmarkProperties.js (content/bookmarkProperties.js) content/browser/places/placesOverlay.xul (content/placesOverlay.xul) -* content/browser/places/menu.xml (content/menu.xml) + content/browser/places/menu.xml (content/menu.xml) content/browser/places/tree.xml (content/tree.xml) content/browser/places/controller.js (content/controller.js) content/browser/places/treeView.js (content/treeView.js) -* content/browser/places/browserPlacesViews.js (content/browserPlacesViews.js) + content/browser/places/browserPlacesViews.js (content/browserPlacesViews.js) # keep the Places version of the history sidebar at history/history-panel.xul # to prevent having to worry about between versions of the browser -* content/browser/history/history-panel.xul (content/history-panel.xul) + content/browser/history/history-panel.xul (content/history-panel.xul) content/browser/places/history-panel.js (content/history-panel.js) # ditto for the bookmarks sidebar content/browser/bookmarks/bookmarksPanel.xul (content/bookmarksPanel.xul) content/browser/bookmarks/bookmarksPanel.js (content/bookmarksPanel.js) -* content/browser/bookmarks/sidebarUtils.js (content/sidebarUtils.js) + content/browser/bookmarks/sidebarUtils.js (content/sidebarUtils.js) content/browser/places/moveBookmarks.xul (content/moveBookmarks.xul) content/browser/places/moveBookmarks.js (content/moveBookmarks.js) content/browser/places/editBookmarkOverlay.xul (content/editBookmarkOverlay.xul) content/browser/places/editBookmarkOverlay.js (content/editBookmarkOverlay.js) -* content/browser/places/downloadsViewOverlay.xul (content/downloadsViewOverlay.xul) + content/browser/places/downloadsViewOverlay.xul (content/downloadsViewOverlay.xul) diff --git a/application/palemoon/components/preferences/jar.mn b/application/palemoon/components/preferences/jar.mn index 7e8ac3bc8a..7981a9cb75 100644 --- a/application/palemoon/components/preferences/jar.mn +++ b/application/palemoon/components/preferences/jar.mn @@ -8,25 +8,25 @@ browser.jar: content/browser/preferences/applications.xul * content/browser/preferences/applications.js content/browser/preferences/applicationManager.xul -* content/browser/preferences/applicationManager.js + content/browser/preferences/applicationManager.js * content/browser/preferences/colors.xul -* content/browser/preferences/cookies.xul -* content/browser/preferences/cookies.js + content/browser/preferences/cookies.xul + content/browser/preferences/cookies.js * content/browser/preferences/content.xul content/browser/preferences/content.js -* content/browser/preferences/connection.xul + content/browser/preferences/connection.xul content/browser/preferences/connection.js -* content/browser/preferences/fonts.xul + content/browser/preferences/fonts.xul content/browser/preferences/fonts.js content/browser/preferences/handlers.xml content/browser/preferences/handlers.css -* content/browser/preferences/languages.xul + content/browser/preferences/languages.xul content/browser/preferences/languages.js * content/browser/preferences/main.xul content/browser/preferences/main.js content/browser/preferences/newtaburl.js content/browser/preferences/permissions.xul -* content/browser/preferences/permissions.js + content/browser/preferences/permissions.js * content/browser/preferences/preferences.xul content/browser/preferences/privacy.xul content/browser/preferences/privacy.js diff --git a/application/palemoon/components/privatebrowsing/jar.mn b/application/palemoon/components/privatebrowsing/jar.mn index 75e985c139..5667dc338e 100644 --- a/application/palemoon/components/privatebrowsing/jar.mn +++ b/application/palemoon/components/privatebrowsing/jar.mn @@ -3,4 +3,4 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. browser.jar: -* content/browser/aboutPrivateBrowsing.xhtml (content/aboutPrivateBrowsing.xhtml) + content/browser/aboutPrivateBrowsing.xhtml (content/aboutPrivateBrowsing.xhtml) diff --git a/application/palemoon/components/search/jar.mn b/application/palemoon/components/search/jar.mn index e6c42f97d5..71f6ba45e2 100644 --- a/application/palemoon/components/search/jar.mn +++ b/application/palemoon/components/search/jar.mn @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. browser.jar: -* content/browser/search/search.xml (content/search.xml) + content/browser/search/search.xml (content/search.xml) content/browser/search/searchbarBindings.css (content/searchbarBindings.css) content/browser/search/engineManager.xul (content/engineManager.xul) content/browser/search/engineManager.js (content/engineManager.js) diff --git a/application/palemoon/components/sessionstore/jar.mn b/application/palemoon/components/sessionstore/jar.mn index 825b00fbbb..7ad408e4c3 100644 --- a/application/palemoon/components/sessionstore/jar.mn +++ b/application/palemoon/components/sessionstore/jar.mn @@ -4,5 +4,5 @@ browser.jar: * content/browser/aboutSessionRestore.xhtml (content/aboutSessionRestore.xhtml) -* content/browser/aboutSessionRestore.js (content/aboutSessionRestore.js) + content/browser/aboutSessionRestore.js (content/aboutSessionRestore.js) content/browser/content-sessionStore.js (content/content-sessionStore.js) diff --git a/application/palemoon/components/shell/jar.mn b/application/palemoon/components/shell/jar.mn index 39303f275b..4cff4da9e9 100644 --- a/application/palemoon/components/shell/jar.mn +++ b/application/palemoon/components/shell/jar.mn @@ -3,5 +3,5 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. browser.jar: -* content/browser/setDesktopBackground.xul (content/setDesktopBackground.xul) + content/browser/setDesktopBackground.xul (content/setDesktopBackground.xul) * content/browser/setDesktopBackground.js (content/setDesktopBackground.js)