align with latest comm 253

frg/work-js/comm-release/patches/1850283-119a1.patch

@@ -1,176 +0,0 @@
-# HG changeset patch
-# User Eamonn Prendergast <eprendergast@wpi.edu>
-# Date 1693388572 -7200
-# Node ID 22bf829d5b9e62c5f3ed0caa15601dc6db3cc1dd
-# Parent  256b7a82e62fafd203bc88adac8169c072746894
-Bug 1850283 - Removed preference mailnews.remember_selected_message r=mkmelin
-
-Differential Revision: https://phabricator.services.mozilla.com/D187002
-
-diff --git a/mail/base/content/folderDisplay.js b/mail/base/content/folderDisplay.js
---- a/mail/base/content/folderDisplay.js
-+++ b/mail/base/content/folderDisplay.js
-@@ -1149,18 +1149,17 @@ FolderDisplayWidget.prototype = {
-         this.navigate(nsMsgNavigationType.firstNew, /* select */ false))
-       return;
- 
-     // - last selected message
-     // if configured to load the last selected message (this is currently more
-     //  persistent than our saveSelection/restoreSelection stuff), and the view
-     //  is backed by a single underlying folder (the only way having just a
-     //  message key works out), try that
--    if (Services.prefs.getBoolPref("mailnews.remember_selected_message") &&
--        this.view.isSingleFolder && this.view.displayedFolder) {
-+    if (this.view.isSingleFolder && this.view.displayedFolder) {
-       // use the displayed folder; nsMsgDBView goes to the effort to save the
-       //  state to the viewFolder, so this is the correct course of action.
-       let lastLoadedMessageKey = this.view.displayedFolder.lastMessageLoaded;
-       if (lastLoadedMessageKey != nsMsgKey_None) {
-         this.view.dbView.selectMsgByKey(lastLoadedMessageKey);
-         // The message key may not be present in the view for a variety of
-         //  reasons.  Beyond message deletion, it simply may not match the
-         //  active mail view or quick search, for example.
-diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js
---- a/mailnews/mailnews.js
-+++ b/mailnews/mailnews.js
-@@ -357,17 +357,16 @@ pref("mail.close_message_window.on_delet
- pref("mailnews.reuse_message_window", true);
- #endif
- 
- pref("mailnews.open_window_warning", 10); // warn user if they attempt to open more than this many messages at once
- pref("mailnews.open_tab_warning", 20); // warn user if they attempt to open more than this many messages at once
- 
- pref("mailnews.start_page.enabled", true);
- 
--pref("mailnews.remember_selected_message", true);
- pref("mailnews.scroll_to_new_message", true);
- 
- // if true, any click on a column header other than the thread column will unthread the view
- pref("mailnews.thread_pane_column_unthreads", false);
- 
- pref("mailnews.account_central_page.url", "chrome://messenger/locale/messenger.properties");
- 
- /* default prefs for Mozilla 5.0 */
-diff --git a/suite/app/profile/suite-prefs.js b/suite/app/profile/suite-prefs.js
---- a/suite/app/profile/suite-prefs.js
-+++ b/suite/app/profile/suite-prefs.js
-@@ -954,17 +954,16 @@ pref("services.sync.prefs.sync.mailnews.
- pref("services.sync.prefs.sync.mailnews.mark_message_read.delay.interval", true);
- pref("services.sync.prefs.sync.mailnews.messageid.openInNewWindow", true);
- pref("services.sync.prefs.sync.mailnews.message_display.disable_remote_image", true);
- pref("services.sync.prefs.sync.mailnews.nav_crosses_folders", true);
- pref("services.sync.prefs.sync.mailnews.offline_sync_mail", true);
- pref("services.sync.prefs.sync.mailnews.offline_sync_news", true);
- pref("services.sync.prefs.sync.mailnews.offline_sync_send_unsent", true);
- pref("services.sync.prefs.sync.mailnews.offline_sync_work_offline", true);
--pref("services.sync.prefs.sync.mailnews.remember_selected_message", true);
- pref("services.sync.prefs.sync.mailnews.reply_header_authorwrotesingle", true);
- pref("services.sync.prefs.sync.mailnews.reply_header_ondateauthorwrote", true);
- pref("services.sync.prefs.sync.mailnews.reply_header_authorwroteondate", true);
- pref("services.sync.prefs.sync.mailnews.reply_header_locale", true);
- pref("services.sync.prefs.sync.mailnews.reply_header_originalmessage", true);
- pref("services.sync.prefs.sync.mailnews.reply_header_type", true);
- pref("services.sync.prefs.sync.mailnews.scroll_to_new_message", true);
- pref("services.sync.prefs.sync.mailnews.sendInBackground", true);
-diff --git a/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp b/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp
---- a/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp
-+++ b/suite/components/migration/src/nsThunderbirdProfileMigrator.cpp
-@@ -355,17 +355,16 @@ nsThunderbirdProfileMigrator::PrefTransf
-   MAKESAMETYPEPREFTRANSFORM("mailnews.nav_crosses_folders",            Int),
- 
-   MAKESAMETYPEPREFTRANSFORM("mailnews.offline_sync_mail",              Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.offline_sych_news",              Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.offline_sync_send_unsent",       Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.offline_sync_work_offline",      Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.open_window_warning",            Int),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.plaintext_domains",              String),
--  MAKESAMETYPEPREFTRANSFORM("mailnews.remember_selected_message",      Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.reply_in_default_charset",       Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.reuse_message_window",           Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.scroll_to_new_message",          Bool),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.search_date_format",             String),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.search_date_leading_zeros",      String),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.search_date_separator",          String),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.send_default_charset",           String),
-   MAKESAMETYPEPREFTRANSFORM("mailnews.send_plaintext_flowed",          Bool),
-diff --git a/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd b/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
---- a/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
-+++ b/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
-@@ -24,10 +24,8 @@
- 
- <!ENTITY messengerStartPage.caption       "Mail Start Page">
- <!ENTITY enableStartPage.label            "When Mail launches, show the Start Page in the message area">
- <!ENTITY enableStartPage.accesskey        "W">
- <!ENTITY location.label                   "Location:">
- <!ENTITY location.accesskey               "L">
- <!ENTITY useDefault.label                 "Restore Default">
- <!ENTITY useDefault.accesskey             "D">
--<!ENTITY rememberLastMsg.label            "Remember the last selected message">
--<!ENTITY rememberLastMsg.accesskey        "R">
-diff --git a/suite/mailnews/components/prefs/content/pref-mailnews.xul b/suite/mailnews/components/prefs/content/pref-mailnews.xul
---- a/suite/mailnews/components/prefs/content/pref-mailnews.xul
-+++ b/suite/mailnews/components/prefs/content/pref-mailnews.xul
-@@ -15,18 +15,16 @@
- <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-   <prefpane id="mailnews_pane"
-             label="&pref.mailnews.title;"
-             script="chrome://messenger/content/pref-mailnews.js">
- 
-     <preferences id="mailnews_preferences">
-       <preference id="mailnews.confirm.moveFoldersToTrash"
-                   name="mailnews.confirm.moveFoldersToTrash" type="bool"/>
--      <preference id="mailnews.remember_selected_message"
--                  name="mailnews.remember_selected_message" type="bool"/>
-       <preference id="mailnews.thread_pane_column_unthreads"
-                   name="mailnews.thread_pane_column_unthreads"
-                   inverted="true" type="bool"/>
-       <preference id="mail.tabs.autoHide"
-                   name="mail.tabs.autoHide"
-                   type="bool"/>
-       <preference id="mail.tabs.loadInBackground"
-                   name="mail.tabs.loadInBackground"
-@@ -53,22 +51,16 @@
- 
-       <hbox align="center">
-         <checkbox id="mailnewsConfirmMoveFoldersToTrash" label="&confirmMove.label;"
-                   preference="mailnews.confirm.moveFoldersToTrash"
-                   accesskey="&confirmMove.accesskey;"/>
-       </hbox>
- 
-       <hbox align="center">
--        <checkbox id="mailRememberLastMsg" label="&rememberLastMsg.label;"
--                  preference="mailnews.remember_selected_message"
--                  accesskey="&rememberLastMsg.accesskey;" />
--      </hbox>
--
--      <hbox align="center">
-         <checkbox id="mailPreserveThreading"
-                   label="&preserveThreading.label;"
-                   accesskey="&preserveThreading.accesskey;"
-                   preference="mailnews.thread_pane_column_unthreads"/>
-       </hbox>
- 
-       <hbox align="center">
-         <checkbox id="mailAutoHide"
-diff --git a/suite/mailnews/content/msgMail3PaneWindow.js b/suite/mailnews/content/msgMail3PaneWindow.js
---- a/suite/mailnews/content/msgMail3PaneWindow.js
-+++ b/suite/mailnews/content/msgMail3PaneWindow.js
-@@ -71,17 +71,17 @@ function SelectAndScrollToKey(aMsgKey)
- 
- // A helper routine called after a folder is loaded to make sure
- // we select and scroll to the correct message (could be the first new message,
- // could be the last displayed message, etc.)
- function ScrollToMessageAfterFolderLoad(folder)
- {
-   var scrolled = Services.prefs.getBoolPref("mailnews.scroll_to_new_message") &&
-       ScrollToMessage(nsMsgNavigationType.firstNew, true, false /* selectMessage */);
--  if (!scrolled && folder && Services.prefs.getBoolPref("mailnews.remember_selected_message"))
-+  if (!scrolled && folder)
-   {
-     // If we failed to scroll to a new message,
-     // reselect the last selected message
-     var lastMessageLoaded = folder.lastMessageLoaded;
-     if (lastMessageLoaded != nsMsgKey_None)
-       scrolled = SelectAndScrollToKey(lastMessageLoaded);
-   }
- 

frg/work-js/comm-release/patches/series

@@ -2078,7 +2078,6 @@ NOBUG-killtelemetrystartup-cc-25317.patch
 1816266-5-112a1.patch
 1816266-6-112a1.patch
 1848557-pdfium-tb-118a1.patch
-1850283-119a1.patch
 1841165-1-cleaninstaller-1_1-25318.patch
 1841165-2-nosurvey-1_1-25318.patch
 1841169-port1079662-suite-25318.patch
@@ -2098,7 +2097,7 @@ NOBUG-fixcalbackend-25318.patch
 1835524-bugsplat-cr-25318.patch
 1852838-dataman-perms-25318.patch
 1858248-fiximport-25318.patch
-1859836-init-ftl-toolkit-1_1-25318.patch
+1859386-init-ftl-toolkit-1_1-25318.patch
 1841167-2-fixbranding-25318.patch
 1837261-2-version-beta-cr-25318.patch
 1861842-version-release-cr-25318.patch