Bug 1606538 - Remove localised pref mailnews.account_central_page.url; r=mkmelin
authorGeoff Lankow <geoff@darktrojan.net>
Wed, 01 Jan 2020 16:19:45 +1300
changeset 37854 8aca29c49f299de8fe12c5dd833737026dabd69c
parent 37853 a5a26b1ee9ecaa232a01eea49a1cba758a05778b
child 37855 f54114484988ee9c076c584b60a07d22117a920a
push id397
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:16:13 +0000
reviewersmkmelin
bugs1606538
Bug 1606538 - Remove localised pref mailnews.account_central_page.url; r=mkmelin
mail/base/content/folderDisplay.js
mail/locales/en-US/chrome/messenger/messenger.properties
mailnews/mailnews.js
--- a/mail/base/content/folderDisplay.js
+++ b/mail/base/content/folderDisplay.js
@@ -1811,23 +1811,20 @@ FolderDisplayWidget.prototype = {
     if (!this.displayedFolder && MailServices.accounts.accounts.length > 0) {
       // If we have any accounts set up, but no folder is selected yet,
       // we expect another selection event to come when session restore finishes.
       // Until then, do nothing.
       return;
     }
     var accountBox = document.getElementById("accountCentralBox");
     document.getElementById("displayDeck").selectedPanel = accountBox;
-    var acctCentralPage = Services.prefs.getComplexValue(
-      "mailnews.account_central_page.url",
-      Ci.nsIPrefLocalizedString
-    ).data;
+
     // Prevent a second load if necessary.
     let loadURL =
-      acctCentralPage +
+      "chrome://messenger/content/msgAccountCentral.xhtml" +
       (this.displayedFolder ? "?folderURI=" + this.displayedFolder.URI : "");
     if (window.frames.accountCentralPane.location.href != loadURL) {
       window.frames.accountCentralPane.location.href = loadURL;
     }
   },
 
   /**
    * Call this when the tab using us is being hidden.
--- a/mail/locales/en-US/chrome/messenger/messenger.properties
+++ b/mail/locales/en-US/chrome/messenger/messenger.properties
@@ -306,18 +306,16 @@ nocachedbodybody2=The body of this messa
 the server for reading offline. To read this message, \
 you must reconnect to the network, choose Offline from \
 the File menu and then uncheck Work Offline. \
 In the future, you can select which messages or folders to read offline. To do \
 this, choose Offline from the file menu and then select Download/Sync Now. \
 You can adjust the Disk Space preference to prevent the downloading of large \
 messages.
 
-# accountCentral
-mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xhtml
 # LOCALIZATION NOTE(acctCentralTitleFormat): %1$S is brand, %2$S is account type, %3$S is account name
 acctCentralTitleFormat=%1$S %2$S - %3$S
 mailAcctType=Mail
 newsAcctType=News
 feedsAcctType=Feeds
 
 # LOCALIZATION NOTE(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n
--- a/mailnews/mailnews.js
+++ b/mailnews/mailnews.js
@@ -394,18 +394,16 @@ pref("mailnews.open_tab_warning", 20); /
 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 */
 pref("mail.identity.default.compose_html", true);
 pref("mail.identity.default.valid", true);
 pref("mail.identity.default.fcc", true);
 pref("mail.identity.default.fcc_folder", "mailbox://nobody@Local%20Folders/Sent");
 pref("mail.identity.default.fcc_reply_follows_parent", false);
 pref("mail.identity.default.autocompleteToMyDomain", false);