|
|
@@ -3,7 +3,7 @@
|
|
|
# Date 1626813122 14400
|
|
|
# Tue Jul 20 16:32:02 2021 -0400
|
|
|
# Node ID 1de38ba2521de8b67e9c4a651c27bccd08770286
|
|
|
-# Parent 31a1e73d21cdcd3d7e10072baf1227f325112fcf
|
|
|
+# Parent 2f0503331505e85576915072a1c0e36d62128e4b
|
|
|
Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
|
|
|
|
|
|
diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
|
|
|
@@ -30,7 +30,7 @@ diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
|
|
|
pref("general.startup.mail", false);
|
|
|
pref("general.startup.news", false);
|
|
|
pref("general.startup.editor", false);
|
|
|
-@@ -739,18 +739,18 @@ pref("privacy.clearOnShutdown.siteSettin
|
|
|
+@@ -748,18 +748,18 @@ pref("privacy.clearOnShutdown.siteSettin
|
|
|
pref("privacy.warn_tracking_content", true);
|
|
|
|
|
|
// Switching this on will also spoof our user agent and other potentially
|
|
|
@@ -1997,7 +1997,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
|
// profile startup handler (contains profile initialization routines)
|
|
|
_onProfileStartup: function()
|
|
|
{
|
|
|
-@@ -773,17 +773,17 @@ SuiteGlue.prototype = {
|
|
|
+@@ -799,17 +799,17 @@ SuiteGlue.prototype = {
|
|
|
.createInstance(Ci.nsIMutableArray);
|
|
|
let str = Cc["@mozilla.org/supports-string;1"]
|
|
|
.createInstance(Ci.nsISupportsString);
|
|
|
@@ -2016,7 +2016,7 @@ diff --git a/suite/components/nsSuiteGlue.js b/suite/components/nsSuiteGlue.js
|
|
|
|
|
|
Services.prefs.clearUserPref(PREF_EM_NEW_ADDONS_LIST);
|
|
|
},
|
|
|
-@@ -977,17 +977,17 @@ SuiteGlue.prototype = {
|
|
|
+@@ -1003,17 +1003,17 @@ SuiteGlue.prototype = {
|
|
|
if (ShellService) try {
|
|
|
var appTypes = ShellService.shouldBeDefaultClientFor;
|
|
|
|
|
|
@@ -2631,7 +2631,7 @@ diff --git a/suite/components/pref/content/pref-sync.js b/suite/components/pref/
|
|
|
diff --git a/suite/components/pref/content/preferences.xhtml b/suite/components/pref/content/preferences.xhtml
|
|
|
--- a/suite/components/pref/content/preferences.xhtml
|
|
|
+++ b/suite/components/pref/content/preferences.xhtml
|
|
|
-@@ -59,211 +59,211 @@
|
|
|
+@@ -59,206 +59,206 @@
|
|
|
|
|
|
<treechildren id="prefsPanelChildren">
|
|
|
<!-- Appearance items -->
|
|
|
@@ -2772,15 +2772,9 @@ diff --git a/suite/components/pref/content/preferences.xhtml b/suite/components/
|
|
|
<treeitem id="passwordsItem"
|
|
|
label="&passwords.label;"
|
|
|
prefpane="passwords_pane"
|
|
|
-- url="chrome://communicator/content/pref/pref-passwords.xul"
|
|
|
-+ url="chrome://communicator/content/pref/pref-passwords.xhtml"
|
|
|
+- url="chrome://pippki/content/pref-passwords.xul"
|
|
|
++ url="chrome://pippki/content/pref-passwords.xhtml"
|
|
|
helpTopic="passwords_prefs"/>
|
|
|
- <treeitem id="masterpassItem"
|
|
|
- label="&masterpass.label;"
|
|
|
- prefpane="masterpass_pane"
|
|
|
-- url="chrome://pippki/content/pref-masterpass.xul"
|
|
|
-+ url="chrome://pippki/content/pref-masterpass.xhtml"
|
|
|
- helpTopic="passwords_master"/>
|
|
|
<treeitem id="sslItem"
|
|
|
label="&ssltls.label;"
|
|
|
prefpane="ssl_pane"
|
|
|
@@ -2882,7 +2876,7 @@ diff --git a/suite/components/pref/content/preferences.xhtml b/suite/components/
|
|
|
diff --git a/suite/components/pref/jar.mn b/suite/components/pref/jar.mn
|
|
|
--- a/suite/components/pref/jar.mn
|
|
|
+++ b/suite/components/pref/jar.mn
|
|
|
-@@ -1,74 +1,74 @@
|
|
|
+@@ -1,73 +1,73 @@
|
|
|
# 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/.
|
|
|
@@ -2962,9 +2956,7 @@ diff --git a/suite/components/pref/jar.mn b/suite/components/pref/jar.mn
|
|
|
+ content/communicator/pref/pref-navigator.xhtml (content/pref-navigator.xhtml)
|
|
|
content/communicator/pref/pref-offlineapps.js (content/pref-offlineapps.js)
|
|
|
- content/communicator/pref/pref-offlineapps.xul (content/pref-offlineapps.xul)
|
|
|
-- content/communicator/pref/pref-passwords.xul (content/pref-passwords.xul)
|
|
|
+ content/communicator/pref/pref-offlineapps.xhtml (content/pref-offlineapps.xhtml)
|
|
|
-+ content/communicator/pref/pref-passwords.xhtml (content/pref-passwords.xhtml)
|
|
|
content/communicator/pref/pref-popups.js (content/pref-popups.js)
|
|
|
- content/communicator/pref/pref-popups.xul (content/pref-popups.xul)
|
|
|
+ content/communicator/pref/pref-popups.xhtml (content/pref-popups.xhtml)
|
|
|
@@ -3133,9 +3125,9 @@ diff --git a/suite/components/security/content/prefs/pref-certs.js b/suite/compo
|
|
|
+ "chrome://pippki/content/device_manager.xhtml",
|
|
|
"", null);
|
|
|
}
|
|
|
-diff --git a/suite/components/security/content/prefs/pref-masterpass.js b/suite/components/security/content/prefs/pref-masterpass.js
|
|
|
---- a/suite/components/security/content/prefs/pref-masterpass.js
|
|
|
-+++ b/suite/components/security/content/prefs/pref-masterpass.js
|
|
|
+diff --git a/suite/components/security/content/prefs/pref-passwords.js b/suite/components/security/content/prefs/pref-passwords.js
|
|
|
+--- a/suite/components/security/content/prefs/pref-passwords.js
|
|
|
++++ b/suite/components/security/content/prefs/pref-passwords.js
|
|
|
@@ -12,20 +12,20 @@ function Startup() {
|
|
|
gInternalToken = tokendb.getInternalKeyToken();
|
|
|
}
|
|
|
@@ -3171,9 +3163,9 @@ diff --git a/suite/components/security/jar.mn b/suite/components/security/jar.mn
|
|
|
content/pippki/pref-certs.js (content/prefs/pref-certs.js)
|
|
|
- content/pippki/pref-certs.xul (content/prefs/pref-certs.xul)
|
|
|
+ content/pippki/pref-certs.xhtml (content/prefs/pref-certs.xhtml)
|
|
|
- content/pippki/pref-masterpass.js (content/prefs/pref-masterpass.js)
|
|
|
-- content/pippki/pref-masterpass.xul (content/prefs/pref-masterpass.xul)
|
|
|
-+ content/pippki/pref-masterpass.xhtml (content/prefs/pref-masterpass.xhtml)
|
|
|
+ content/pippki/pref-passwords.js (content/prefs/pref-passwords.js)
|
|
|
+- content/pippki/pref-passwords.xul (content/prefs/pref-passwords.xul)
|
|
|
++ content/pippki/pref-passwords.xhtml (content/prefs/pref-passwords.xhtml)
|
|
|
content/pippki/pref-ssl.js (content/prefs/pref-ssl.js)
|
|
|
- content/pippki/pref-ssl.xul (content/prefs/pref-ssl.xul)
|
|
|
+ content/pippki/pref-ssl.xhtml (content/prefs/pref-ssl.xhtml)
|
|
|
@@ -4870,9 +4862,9 @@ diff --git a/suite/mailnews/components/prefs/jar.mn b/suite/mailnews/components/
|
|
|
|
|
|
messenger.jar:
|
|
|
- content/messenger/mailPrefsOverlay.xul (content/mailPrefsOverlay.xul)
|
|
|
-- content/messenger/pref-mailnews.xul (content/pref-mailnews.xul)
|
|
|
+-* content/messenger/pref-mailnews.xul (content/pref-mailnews.xul)
|
|
|
+ content/messenger/mailPrefsOverlay.xhtml (content/mailPrefsOverlay.xhtml)
|
|
|
-+ content/messenger/pref-mailnews.xhtml (content/pref-mailnews.xhtml)
|
|
|
++* content/messenger/pref-mailnews.xhtml (content/pref-mailnews.xhtml)
|
|
|
content/messenger/pref-mailnews.js (content/pref-mailnews.js)
|
|
|
- content/messenger/pref-notifications.xul (content/pref-notifications.xul)
|
|
|
+ content/messenger/pref-notifications.xhtml (content/pref-notifications.xhtml)
|
|
|
@@ -5090,7 +5082,7 @@ diff --git a/suite/mailnews/content/SearchDialog.xhtml b/suite/mailnews/content/
|
|
|
diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folderPane.js
|
|
|
--- a/suite/mailnews/content/folderPane.js
|
|
|
+++ b/suite/mailnews/content/folderPane.js
|
|
|
-@@ -1722,17 +1722,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1735,17 +1735,17 @@ var gFolderTreeController = {
|
|
|
// createSubfolder can throw an exception, causing the newFolder dialog
|
|
|
// to not close and wait for another input.
|
|
|
// TODO: Rewrite this logic and move the opening of alert dialogs from
|
|
|
@@ -5109,7 +5101,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
-@@ -1797,17 +1797,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1810,17 +1810,17 @@ var gFolderTreeController = {
|
|
|
// context menu on a non-loaded folder).
|
|
|
if (msgFolder == GetLoadedMsgFolder()) {
|
|
|
gRerootOnFolderLoad = true;
|
|
|
@@ -5128,7 +5120,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
rebuildSummaryCallback: rebuildSummary});
|
|
|
},
|
|
|
|
|
|
-@@ -1828,17 +1828,17 @@ var gFolderTreeController = {
|
|
|
+@@ -1841,17 +1841,17 @@ var gFolderTreeController = {
|
|
|
|
|
|
controller._resetThreadPane();
|
|
|
let folderTree = document.getElementById("folderTree");
|
|
|
@@ -5147,7 +5139,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
/**
|
|
|
* Deletes a folder from its parent. Also handles unsubscribe from newsgroups
|
|
|
* if the selected folder/s happen to be nntp.
|
|
|
-@@ -1987,17 +1987,17 @@ var gFolderTreeController = {
|
|
|
+@@ -2000,17 +2000,17 @@ var gFolderTreeController = {
|
|
|
let folder = aParent || GetSelectedMsgFolders()[0];
|
|
|
if (!folder)
|
|
|
folder = GetDefaultAccountRootFolder();
|
|
|
@@ -5166,7 +5158,7 @@ diff --git a/suite/mailnews/content/folderPane.js b/suite/mailnews/content/folde
|
|
|
/**
|
|
|
* Opens the dialog to edit the properties for a virtual folder
|
|
|
*
|
|
|
-@@ -2009,17 +2009,17 @@ var gFolderTreeController = {
|
|
|
+@@ -2022,17 +2022,17 @@ var gFolderTreeController = {
|
|
|
function editVirtualCallback(aURI) {
|
|
|
// we need to reload the folder if it is the currently loaded folder...
|
|
|
if (gMsgFolderSelected && aURI == gMsgFolderSelected.URI) {
|
Frank-Rainer Grahl