Bug 1898444 - Stop automatically setting the default account to log in at start-up. r=mkmelin

Differential Revision: https://phabricator.services.mozilla.com/D211322

--HG--
extra : rebase_source : 20edd382a4f23ce1b42ac712019b0609ca6fd875
extra : amend_source : 2fd2344a5fe316ca151dd15c19e82eb47e16ff74

mail/base/content/messenger.js

@@ -67,9 +67,6 @@ ChromeUtils.defineLazyGetter(this, "PopupNotifications", function () {
 
 /* This is where functions related to the 3 pane window are kept */
 
-// from MailNewsTypes.h
-var kMailCheckOncePrefName = "mail.startup.enabledMailCheckOnce";
-
 /**
  * Tracks whether the right mouse button changed the selection or not.  If the
  * user right clicks on the selection, it stays the same.  If they click outside
@@ -740,14 +737,6 @@ async function loadStartFolder(initialUri) {
 
       startFolder = rootMsgFolder;
 
-      // Enable check new mail once by turning checkmail pref 'on' to bring
-      // all users to one plane. This allows all users to go to Inbox. User can
-      // always go to server settings panel and turn off "Check for new mail at startup"
-      if (!Services.prefs.getBoolPref(kMailCheckOncePrefName)) {
-        Services.prefs.setBoolPref(kMailCheckOncePrefName, true);
-        defaultServer.loginAtStartUp = true;
-      }
-
       // Get the user pref to see if the login at startup is enabled for default account
       isLoginAtStartUpEnabled = defaultServer.loginAtStartUp;
 

mail/test/browser/account/browser-clear.ini

@@ -7,7 +7,6 @@ prefs =
   mail.accountmanager.defaultaccount=
   mail.accountmanager.localfoldersserver=
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.auto_config.addons_url=about:blank
   mailnews.auto_config_url=about:blank

mail/test/browser/account/browser.ini

@@ -41,7 +41,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.auto_config.addons_url=about:blank
   mailnews.auto_config.fetchFromExchange.enabled=false

mail/test/browser/cloudfile/browser.ini

@@ -36,7 +36,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank

mail/test/browser/composition/browser.ini

@@ -37,7 +37,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank

mail/test/browser/content-tabs/browser.ini

@@ -36,7 +36,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank

mail/test/browser/folder-display/browser.ini

@@ -36,7 +36,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank

mail/test/browser/folder-pane/browser.ini

@@ -31,7 +31,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank

mail/test/browser/folder-tree-modes/browser.ini

@@ -35,7 +35,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank

mail/test/browser/folder-widget/browser.ini

@@ -35,7 +35,6 @@ prefs =
   mail.smtpserver.smtp1.username=tinderbox
   mail.smtpservers=smtp1
   mail.spotlight.firstRunDone=true
-  mail.startup.enabledMailCheckOnce=true
   mail.winsearch.firstRunDone=true
   mailnews.start_page.override_url=about:blank
   mailnews.start_page.url=about:blank

mailnews/base/prefs/content/AccountWizard.js

@@ -166,8 +166,8 @@ function FinishAccount() {
 
     setupCopiesAndFoldersServer(gCurrentAccount, accountData);
 
-    if (gCurrentAccount.incomingServer.canBeDefaultServer) {
-      EnableCheckMailAtStartUpIfNeeded(gCurrentAccount);
+    if (!gDefaultAccount && gCurrentAccount.incomingServer.canBeDefaultServer) {
+      MailServices.accounts.defaultAccount = gCurrentAccount;
     }
 
     // in case we crash, force us a save of the prefs file NOW
@@ -588,18 +588,3 @@ function onFlush() {
   Services.prefs.setBoolPref("nglayout.debug.disable_xul_cache", true);
   Services.prefs.setBoolPref("nglayout.debug.disable_xul_cache", false);
 }
-
-/** If there are no default accounts..
- * this is will be the new default, so enable
- * check for mail at startup
- */
-function EnableCheckMailAtStartUpIfNeeded(newAccount) {
-  // Check if default account existed.
-  // If no such account, make this one the default account
-  // and turn on the new mail check at startup for the current account
-  if (!gDefaultAccount) {
-    MailServices.accounts.defaultAccount = newAccount;
-    newAccount.incomingServer.loginAtStartUp = true;
-    newAccount.incomingServer.downloadOnBiff = true;
-  }
-}

mailnews/mailnews.js

@@ -804,7 +804,6 @@ pref("mail.forward_add_extension", true);
 // Prefix of for mail forwards. E.g. "Fwd" -> subject will be Fwd: <subject>
 pref("mail.forward_subject_prefix", "Fwd");
 
-pref("mail.startup.enabledMailCheckOnce", false);
 // RFC 2646=======
 pref("mailnews.send_plaintext_flowed", true);
 pref("mailnews.display.disable_format_flowed_support", false);