|
@@ -3,7 +3,7 @@
|
|
# Date 1645962131 18000
|
|
# Date 1645962131 18000
|
|
# Sun Feb 27 06:42:11 2022 -0500
|
|
# Sun Feb 27 06:42:11 2022 -0500
|
|
# Node ID 97992f8ecdb8a0607194d1f6c460bdbd3e5a25f2
|
|
# Node ID 97992f8ecdb8a0607194d1f6c460bdbd3e5a25f2
|
|
-# Parent 2ec69e9396cdfafff131cd6df15e08a00a980e6c
|
|
|
|
|
|
+# Parent 23fb3bc03bcdbd426bb232768e7ce303baea59aa
|
|
Bug 1611647 - Port bug 1579952 - Fix references to xul files in suite.
|
|
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
|
|
diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
|
|
@@ -4573,7 +4573,7 @@ diff --git a/suite/mailnews/components/addrbook/jar.mn b/suite/mailnews/componen
|
|
diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
--- a/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
--- a/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
+++ b/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
+++ b/suite/mailnews/components/compose/content/MsgComposeCommands.js
|
|
-@@ -1751,17 +1751,17 @@ function GenericSendMessage(msgType) {
|
|
|
|
|
|
+@@ -1763,17 +1763,17 @@ function GenericSendMessage(msgType) {
|
|
msgType == Ci.nsIMsgCompDeliverMode.Background) {
|
|
msgType == Ci.nsIMsgCompDeliverMode.Background) {
|
|
//Do we need to check the spelling?
|
|
//Do we need to check the spelling?
|
|
if (DoSpellCheckBeforeSend()) {
|
|
if (DoSpellCheckBeforeSend()) {
|
|
@@ -4592,7 +4592,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
|
|
|
|
|
|
// Strip trailing spaces and long consecutive WSP sequences from the
|
|
// Strip trailing spaces and long consecutive WSP sequences from the
|
|
// subject line to prevent getting only WSP chars on a folded line.
|
|
// subject line to prevent getting only WSP chars on a folded line.
|
|
-@@ -1834,17 +1834,17 @@ function GenericSendMessage(msgType) {
|
|
|
|
|
|
+@@ -1846,17 +1846,17 @@ function GenericSendMessage(msgType) {
|
|
if (!CheckValidEmailAddress(msgCompFields.to, msgCompFields.cc, msgCompFields.bcc))
|
|
if (!CheckValidEmailAddress(msgCompFields.to, msgCompFields.cc, msgCompFields.bcc))
|
|
return;
|
|
return;
|
|
|
|
|
|
@@ -4611,7 +4611,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
|
|
}
|
|
}
|
|
|
|
|
|
// We will remember the users "send format" decision in the address
|
|
// We will remember the users "send format" decision in the address
|
|
-@@ -2183,17 +2183,17 @@ function SelectAddress()
|
|
|
|
|
|
+@@ -2195,17 +2195,17 @@ function SelectAddress()
|
|
|
|
|
|
Recipients2CompFields(msgCompFields);
|
|
Recipients2CompFields(msgCompFields);
|
|
|
|
|
|
@@ -4630,7 +4630,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
|
|
ccAddress:ccAddress,
|
|
ccAddress:ccAddress,
|
|
bccAddress:bccAddress});
|
|
bccAddress:bccAddress});
|
|
// We have to set focus to the addressingwidget because we seem to loose focus often
|
|
// We have to set focus to the addressingwidget because we seem to loose focus often
|
|
-@@ -2742,17 +2742,17 @@ function MessageGetNumSelectedAttachment
|
|
|
|
|
|
+@@ -2754,17 +2754,17 @@ function MessageGetNumSelectedAttachment
|
|
{
|
|
{
|
|
var bucketList = GetMsgAttachmentElement();
|
|
var bucketList = GetMsgAttachmentElement();
|
|
return (bucketList) ? bucketList.selectedItems.length : 0;
|
|
return (bucketList) ? bucketList.selectedItems.length : 0;
|
|
@@ -5188,7 +5188,7 @@ diff --git a/suite/mailnews/content/mail-offline.js b/suite/mailnews/content/mai
|
|
diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mailCommands.js
|
|
diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mailCommands.js
|
|
--- a/suite/mailnews/content/mailCommands.js
|
|
--- a/suite/mailnews/content/mailCommands.js
|
|
+++ b/suite/mailnews/content/mailCommands.js
|
|
+++ b/suite/mailnews/content/mailCommands.js
|
|
-@@ -242,17 +242,17 @@ function NewMessageToSelectedAddresses(t
|
|
|
|
|
|
+@@ -244,17 +244,17 @@ function NewMessageToSelectedAddresses(t
|
|
params.composeFields = composeFields;
|
|
params.composeFields = composeFields;
|
|
msgComposeService.OpenComposeWindowWithParams(null, params);
|
|
msgComposeService.OpenComposeWindowWithParams(null, params);
|
|
}
|
|
}
|
|
@@ -5207,7 +5207,7 @@ diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mai
|
|
function SubscribeOKCallback(changeTable)
|
|
function SubscribeOKCallback(changeTable)
|
|
{
|
|
{
|
|
for (var serverURI in changeTable) {
|
|
for (var serverURI in changeTable) {
|
|
-@@ -390,17 +390,17 @@ function ViewPageSource(messages)
|
|
|
|
|
|
+@@ -392,17 +392,17 @@ function ViewPageSource(messages)
|
|
// Now, we need to get a URL from a URI.
|
|
// Now, we need to get a URL from a URI.
|
|
var url = MailServices.mailSession.ConvertMsgURIToMsgURL(messages[i],
|
|
var url = MailServices.mailSession.ConvertMsgURIToMsgURL(messages[i],
|
|
msgWindow);
|
|
msgWindow);
|
|
@@ -5229,7 +5229,7 @@ diff --git a/suite/mailnews/content/mailCommands.js b/suite/mailnews/content/mai
|
|
diff --git a/suite/mailnews/content/mailContextMenus.js b/suite/mailnews/content/mailContextMenus.js
|
|
diff --git a/suite/mailnews/content/mailContextMenus.js b/suite/mailnews/content/mailContextMenus.js
|
|
--- a/suite/mailnews/content/mailContextMenus.js
|
|
--- a/suite/mailnews/content/mailContextMenus.js
|
|
+++ b/suite/mailnews/content/mailContextMenus.js
|
|
+++ b/suite/mailnews/content/mailContextMenus.js
|
|
-@@ -514,26 +514,26 @@ function AddContact(aEmailAddressNode)
|
|
|
|
|
|
+@@ -531,26 +531,26 @@ function AddContact(aEmailAddressNode)
|
|
{
|
|
{
|
|
if (aEmailAddressNode)
|
|
if (aEmailAddressNode)
|
|
AddEmailToAddressBook(aEmailAddressNode.getAttribute("emailAddress"),
|
|
AddEmailToAddressBook(aEmailAddressNode.getAttribute("emailAddress"),
|
|
@@ -5258,7 +5258,7 @@ diff --git a/suite/mailnews/content/mailContextMenus.js b/suite/mailnews/content
|
|
|
|
|
|
/**
|
|
/**
|
|
* SendMailToNode takes the email address title button, extracts the email address
|
|
* SendMailToNode takes the email address title button, extracts the email address
|
|
-@@ -676,17 +676,17 @@ function OpenMessageByHeader(messageHead
|
|
|
|
|
|
+@@ -693,17 +693,17 @@ function OpenMessageByHeader(messageHead
|
|
{
|
|
{
|
|
var folder = messageHeader.folder;
|
|
var folder = messageHeader.folder;
|
|
var folderURI = folder.URI;
|
|
var folderURI = folder.URI;
|
|
@@ -5521,7 +5521,7 @@ diff --git a/suite/mailnews/content/mailWidgets.xml b/suite/mailnews/content/mai
|
|
diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/content/mailWindowOverlay.js
|
|
diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/content/mailWindowOverlay.js
|
|
--- a/suite/mailnews/content/mailWindowOverlay.js
|
|
--- a/suite/mailnews/content/mailWindowOverlay.js
|
|
+++ b/suite/mailnews/content/mailWindowOverlay.js
|
|
+++ b/suite/mailnews/content/mailWindowOverlay.js
|
|
-@@ -1308,17 +1308,17 @@ function MsgOpenFromFile() {
|
|
|
|
|
|
+@@ -1351,17 +1351,17 @@ function MsgOpenFromFile() {
|
|
|
|
|
|
fp.open(rv => {
|
|
fp.open(rv => {
|
|
if (rv != Ci.nsIFilePicker.returnOK || !fp.file) {
|
|
if (rv != Ci.nsIFilePicker.returnOK || !fp.file) {
|
|
@@ -5540,7 +5540,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
let mailWindowService = Cc["@mozilla.org/messenger/windowservice;1"]
|
|
let mailWindowService = Cc["@mozilla.org/messenger/windowservice;1"]
|
|
.getService(Ci.nsIMessengerWindowService);
|
|
.getService(Ci.nsIMessengerWindowService);
|
|
if (!mailWindowService)
|
|
if (!mailWindowService)
|
|
-@@ -1453,17 +1453,17 @@ function MsgOpenNewWindowForMessage(mess
|
|
|
|
|
|
+@@ -1496,17 +1496,17 @@ function MsgOpenNewWindowForMessage(mess
|
|
// required because on a right-click, the currentIndex value will be
|
|
// required because on a right-click, the currentIndex value will be
|
|
// different from the actual row that is highlighted.
|
|
// different from the actual row that is highlighted.
|
|
// GetSelectedMsgFolders() will return the message that is
|
|
// GetSelectedMsgFolders() will return the message that is
|
|
@@ -5559,7 +5559,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
}
|
|
}
|
|
|
|
|
|
function MsgJunk() {
|
|
function MsgJunk() {
|
|
-@@ -1493,17 +1493,17 @@ function MsgMarkMsgAsRead(read) {
|
|
|
|
|
|
+@@ -1536,17 +1536,17 @@ function MsgMarkMsgAsRead(read) {
|
|
MarkSelectedMessagesRead(read);
|
|
MarkSelectedMessagesRead(read);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -5578,7 +5578,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
let folders = GetSelectedMsgFolders();
|
|
let folders = GetSelectedMsgFolders();
|
|
for (let folder of folders)
|
|
for (let folder of folders)
|
|
folder.markAllMessagesRead(msgWindow);
|
|
folder.markAllMessagesRead(msgWindow);
|
|
-@@ -1573,17 +1573,17 @@ function MsgMarkAllFoldersRead() {
|
|
|
|
|
|
+@@ -1616,17 +1616,17 @@ function MsgMarkAllFoldersRead() {
|
|
|
|
|
|
function MsgFilters(emailAddress, folder) {
|
|
function MsgFilters(emailAddress, folder) {
|
|
if (!folder)
|
|
if (!folder)
|
|
@@ -5597,7 +5597,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
if ("refresh" in args && args.refresh) {
|
|
if ("refresh" in args && args.refresh) {
|
|
args = { refresh: true, folder, filter: args.newFilter };
|
|
args = { refresh: true, folder, filter: args.newFilter };
|
|
MsgFilterList(args);
|
|
MsgFilterList(args);
|
|
-@@ -1723,17 +1723,17 @@ function MsgSendUnsentMsgs() {
|
|
|
|
|
|
+@@ -1766,17 +1766,17 @@ function MsgSendUnsentMsgs() {
|
|
|
|
|
|
function PrintEnginePrintInternal(aDoPrintPreview, aMsgType) {
|
|
function PrintEnginePrintInternal(aDoPrintPreview, aMsgType) {
|
|
var messageList = gFolderDisplay.selectedMessageUris;
|
|
var messageList = gFolderDisplay.selectedMessageUris;
|
|
@@ -5616,7 +5616,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
}
|
|
}
|
|
|
|
|
|
function PrintEnginePrint() {
|
|
function PrintEnginePrint() {
|
|
-@@ -1811,17 +1811,17 @@ function getMessageBrowser() {
|
|
|
|
|
|
+@@ -1854,17 +1854,17 @@ function getMessageBrowser() {
|
|
// The zoom manager, view source and possibly some other functions still rely
|
|
// The zoom manager, view source and possibly some other functions still rely
|
|
// on the getBrowser function.
|
|
// on the getBrowser function.
|
|
function getBrowser() {
|
|
function getBrowser() {
|
|
@@ -5635,7 +5635,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
function MsgUpdateMsgCount() {}
|
|
function MsgUpdateMsgCount() {}
|
|
function MsgImport() {}
|
|
function MsgImport() {}
|
|
function MsgSynchronize() {}
|
|
function MsgSynchronize() {}
|
|
-@@ -2576,17 +2576,17 @@ function IgnoreMDNResponse() {
|
|
|
|
|
|
+@@ -2619,17 +2619,17 @@ function IgnoreMDNResponse() {
|
|
* chosen.
|
|
* chosen.
|
|
*
|
|
*
|
|
* @param [aFolder] the folder to open the search window for, if different from
|
|
* @param [aFolder] the folder to open the search window for, if different from
|
|
@@ -5654,7 +5654,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.js b/suite/mailnews/conten
|
|
return;
|
|
return;
|
|
Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
|
|
Services.prefs.setBoolPref("mailnews.ui.junk.firstuse", false);
|
|
|
|
|
|
-@@ -2596,26 +2596,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
|
|
|
|
|
|
+@@ -2639,26 +2639,26 @@ function MsgJunkMailInfo(aCheckFirstUse)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -5741,7 +5741,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.xhtml b/suite/mailnews/con
|
|
|
|
|
|
<commandset id="globalEditMenuItems"
|
|
<commandset id="globalEditMenuItems"
|
|
commandupdater="true"
|
|
commandupdater="true"
|
|
-@@ -1198,29 +1198,29 @@
|
|
|
|
|
|
+@@ -1220,29 +1220,29 @@
|
|
disabled="true"
|
|
disabled="true"
|
|
command="cmd_stop"/>
|
|
command="cmd_stop"/>
|
|
<menuitem id="menu_Stop"
|
|
<menuitem id="menu_Stop"
|
|
@@ -5773,7 +5773,7 @@ diff --git a/suite/mailnews/content/mailWindowOverlay.xhtml b/suite/mailnews/con
|
|
<menupopup id="menu_GoPopup" onpopupshowing="InitGoMessagesMenu();">
|
|
<menupopup id="menu_GoPopup" onpopupshowing="InitGoMessagesMenu();">
|
|
<menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
|
|
<menu id="goNextMenu" label="&nextMenu.label;" accesskey="&nextMenu.accesskey;">
|
|
<menupopup id="menu_GoNextPopup">
|
|
<menupopup id="menu_GoNextPopup">
|
|
-@@ -1849,17 +1849,17 @@
|
|
|
|
|
|
+@@ -1883,17 +1883,17 @@
|
|
<button id="button-advanced"
|
|
<button id="button-advanced"
|
|
label="&advancedButton.label;"
|
|
label="&advancedButton.label;"
|
|
accesskey="&advancedButton.accesskey;"
|
|
accesskey="&advancedButton.accesskey;"
|
|
@@ -5839,7 +5839,7 @@ diff --git a/suite/mailnews/content/messenger.xhtml b/suite/mailnews/content/mes
|
|
diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/content/msgHdrViewOverlay.js
|
|
diff --git a/suite/mailnews/content/msgHdrViewOverlay.js b/suite/mailnews/content/msgHdrViewOverlay.js
|
|
--- a/suite/mailnews/content/msgHdrViewOverlay.js
|
|
--- a/suite/mailnews/content/msgHdrViewOverlay.js
|
|
+++ b/suite/mailnews/content/msgHdrViewOverlay.js
|
|
+++ b/suite/mailnews/content/msgHdrViewOverlay.js
|
|
-@@ -1412,30 +1412,30 @@ createNewAttachmentInfo.prototype.saveAt
|
|
|
|
|
|
+@@ -1414,30 +1414,30 @@ createNewAttachmentInfo.prototype.saveAt
|
|
false);
|
|
false);
|
|
}
|
|
}
|
|
|
|
|