rebasing

comm-central/patches/TOP-1611647-2-fix-xul-references-suite.patch

@@ -1,9 +1,9 @@
 # HG changeset patch
 # User Bill Gianopoulos <wgianopoulos@gmail.com>
-# Date 1685104306 14400
-#      Fri May 26 08:31:46 2023 -0400
-# Node ID 24970d55df690f4ecb025c6d44dee4df58195667
-# Parent  0111ce62b03707c51490f1f6f5595f40ddc1c145
+# Date 1687859748 14400
+#      Tue Jun 27 05:55:48 2023 -0400
+# Node ID cef48c3d22fb9a94394198886d4ff4076f4f238f
+# Parent  5791318005f4e18c18c1693c929c65d81f7d8c0b
 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
@@ -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
 --- a/suite/mailnews/components/compose/content/MsgComposeCommands.js
 +++ b/suite/mailnews/components/compose/content/MsgComposeCommands.js
-@@ -1763,17 +1763,17 @@ function GenericSendMessage(msgType) {
+@@ -1764,17 +1764,17 @@ function GenericSendMessage(msgType) {
        msgType == Ci.nsIMsgCompDeliverMode.Background) {
      //Do we need to check the spelling?
      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
      // subject line to prevent getting only WSP chars on a folded line.
-@@ -1846,17 +1846,17 @@ function GenericSendMessage(msgType) {
+@@ -1847,17 +1847,17 @@ function GenericSendMessage(msgType) {
      if (!CheckValidEmailAddress(msgCompFields.to, msgCompFields.cc, msgCompFields.bcc))
        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
-@@ -2195,17 +2195,17 @@ function SelectAddress()
+@@ -2196,17 +2196,17 @@ function SelectAddress()
  
    Recipients2CompFields(msgCompFields);
  
@@ -4630,7 +4630,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
               ccAddress:ccAddress,
               bccAddress:bccAddress});
    // We have to set focus to the addressingwidget because we seem to loose focus often
-@@ -2762,17 +2762,17 @@ function MessageGetNumSelectedAttachment
+@@ -2763,17 +2763,17 @@ function MessageGetNumSelectedAttachment
  {
    var bucketList = GetMsgAttachmentElement();
    return (bucketList) ? bucketList.selectedItems.length : 0;

comm-central/patches/TOP-1614671-port1456035-4-and-5-61a1-cc.patch

@@ -1656,7 +1656,7 @@ diff --git a/suite/mailnews/components/compose/content/MsgComposeCommands.js b/s
    {
      switch (command)
      {
-@@ -2920,25 +2913,18 @@ function OpenSelectedAttachment()
+@@ -2921,25 +2914,18 @@ function OpenSelectedAttachment()
  }
  
  function nsAttachmentOpener()