From 39be34c06f9dc980a7ea11576365733fb83c342c Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 27 Jul 2020 19:17:14 -0400 Subject: [MailNews] Allow ordering of accounts to respect mail.accountmanager.accounts --- mailnews/base/util/folderUtils.jsm | 9 ++++++++- mailnews/mailnews.js | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'mailnews') diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 62fb7700b..9d2918a7a 100644 --- a/mailnews/base/util/folderUtils.jsm +++ b/mailnews/base/util/folderUtils.jsm @@ -12,6 +12,7 @@ this.EXPORTED_SYMBOLS = ["getFolderProperties", "getSpecialFolderString", Components.utils.import("resource:///modules/mailServices.js"); Components.utils.import("resource:///modules/iteratorUtils.jsm"); +Components.utils.import("resource://gre/modules/Services.jsm"); /** * Returns a string representation of a folder's "special" type. @@ -169,8 +170,14 @@ function allAccountsSorted(aExcludeIMAccounts) { return a.incomingServer.type != "im"; }); } + + // Sort the accounts else will respect the order in mail.accountmanager.accounts + if (Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { + accountList = accountList.sort(compareAccounts); + } + - return accountList.sort(compareAccounts); + return accountList; } /** diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js index 7ebe2eaa7..7aa83c625 100644 --- a/mailnews/mailnews.js +++ b/mailnews/mailnews.js @@ -431,6 +431,7 @@ pref("mail.default_sendlater_uri", "mailbox://nobody@Local%20Folders/Unsent%20Me pref("mail.smtpservers", ""); pref("mail.accountmanager.accounts", ""); +pref("mail.accountmanager.accounts.ordered", true); // Last used account key value pref("mail.account.lastKey", 0); -- cgit v1.2.3 From 9ac440aa71abf4357acea2efee1a26904468ea62 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 27 Jul 2020 19:18:35 -0400 Subject: [MailNews] Allow setting "Local Folders" as always the first displayed account --- mailnews/base/util/folderUtils.jsm | 4 ++++ mailnews/mailnews.js | 1 + 2 files changed, 5 insertions(+) (limited to 'mailnews') diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 9d2918a7a..06e8e4bf2 100644 --- a/mailnews/base/util/folderUtils.jsm +++ b/mailnews/base/util/folderUtils.jsm @@ -176,6 +176,10 @@ function allAccountsSorted(aExcludeIMAccounts) { accountList = accountList.sort(compareAccounts); } + // Set "Local Folders" as always the first displayed account + if (Services.prefs.getBoolPref("mail.accountmanager.localfolderfirst", false)) { + accountList.unshift(accountList.splice(accountList.findIndex(item => item.key === "account1"), 1)[0]); + } return accountList; } diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js index 7aa83c625..afb5ac7f2 100644 --- a/mailnews/mailnews.js +++ b/mailnews/mailnews.js @@ -432,6 +432,7 @@ pref("mail.default_sendlater_uri", "mailbox://nobody@Local%20Folders/Unsent%20Me pref("mail.smtpservers", ""); pref("mail.accountmanager.accounts", ""); pref("mail.accountmanager.accounts.ordered", true); +pref("mail.accountmanager.localfolderfirst", false); // Last used account key value pref("mail.account.lastKey", 0); -- cgit v1.2.3 From 8698bde001373f7d2dd4ecddd80874d683bab32e Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 27 Jul 2020 20:30:56 -0400 Subject: Follow up to 39be34c06 - The check sound be if not ordered --- mailnews/base/util/folderUtils.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mailnews') diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 06e8e4bf2..1562d21d5 100644 --- a/mailnews/base/util/folderUtils.jsm +++ b/mailnews/base/util/folderUtils.jsm @@ -172,7 +172,7 @@ function allAccountsSorted(aExcludeIMAccounts) { } // Sort the accounts else will respect the order in mail.accountmanager.accounts - if (Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { + if (!Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { accountList = accountList.sort(compareAccounts); } -- cgit v1.2.3 From d826eda73d978d617fb346393b4d2f37408a475f Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 27 Jul 2020 20:32:25 -0400 Subject: Revert "Follow up to 39be34c06 - The check sound be if not ordered" This reverts commit 8698bde001373f7d2dd4ecddd80874d683bab32e. --- mailnews/base/util/folderUtils.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mailnews') diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 1562d21d5..06e8e4bf2 100644 --- a/mailnews/base/util/folderUtils.jsm +++ b/mailnews/base/util/folderUtils.jsm @@ -172,7 +172,7 @@ function allAccountsSorted(aExcludeIMAccounts) { } // Sort the accounts else will respect the order in mail.accountmanager.accounts - if (!Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { + if (Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { accountList = accountList.sort(compareAccounts); } -- cgit v1.2.3 From d7d4567ffee9527aaaf4b975246445305e38ef9d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 27 Jul 2020 20:33:34 -0400 Subject: Follow up to 39be34c06 - The check sound be if not ordered I am tired. --- mailnews/base/util/folderUtils.jsm | 2 +- mailnews/mailnews.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mailnews') diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 06e8e4bf2..1562d21d5 100644 --- a/mailnews/base/util/folderUtils.jsm +++ b/mailnews/base/util/folderUtils.jsm @@ -172,7 +172,7 @@ function allAccountsSorted(aExcludeIMAccounts) { } // Sort the accounts else will respect the order in mail.accountmanager.accounts - if (Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { + if (!Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { accountList = accountList.sort(compareAccounts); } diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js index afb5ac7f2..49ac33827 100644 --- a/mailnews/mailnews.js +++ b/mailnews/mailnews.js @@ -431,7 +431,7 @@ pref("mail.default_sendlater_uri", "mailbox://nobody@Local%20Folders/Unsent%20Me pref("mail.smtpservers", ""); pref("mail.accountmanager.accounts", ""); -pref("mail.accountmanager.accounts.ordered", true); +pref("mail.accountmanager.accounts.ordered", false); pref("mail.accountmanager.localfolderfirst", false); // Last used account key value -- cgit v1.2.3 From 13096ddf1db646f2b282ee069c2bc03b303cdec4 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 27 Jul 2020 20:34:47 -0400 Subject: Revert "Follow up to 39be34c06 - The check sound be if not ordered" This reverts commit d7d4567ffee9527aaaf4b975246445305e38ef9d. --- mailnews/base/util/folderUtils.jsm | 2 +- mailnews/mailnews.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mailnews') diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 1562d21d5..06e8e4bf2 100644 --- a/mailnews/base/util/folderUtils.jsm +++ b/mailnews/base/util/folderUtils.jsm @@ -172,7 +172,7 @@ function allAccountsSorted(aExcludeIMAccounts) { } // Sort the accounts else will respect the order in mail.accountmanager.accounts - if (!Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { + if (Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { accountList = accountList.sort(compareAccounts); } diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js index 49ac33827..afb5ac7f2 100644 --- a/mailnews/mailnews.js +++ b/mailnews/mailnews.js @@ -431,7 +431,7 @@ pref("mail.default_sendlater_uri", "mailbox://nobody@Local%20Folders/Unsent%20Me pref("mail.smtpservers", ""); pref("mail.accountmanager.accounts", ""); -pref("mail.accountmanager.accounts.ordered", false); +pref("mail.accountmanager.accounts.ordered", true); pref("mail.accountmanager.localfolderfirst", false); // Last used account key value -- cgit v1.2.3 From 15ed0691f6fe6e558c7e733af9fca0586c4d554b Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Mon, 27 Jul 2020 20:36:11 -0400 Subject: Follow up to 39be34c06 - The check sound be if not ordered FINE! I'll go to bed already... --- mailnews/base/util/folderUtils.jsm | 2 +- mailnews/mailnews.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mailnews') diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 06e8e4bf2..f549bf655 100644 --- a/mailnews/base/util/folderUtils.jsm +++ b/mailnews/base/util/folderUtils.jsm @@ -172,7 +172,7 @@ function allAccountsSorted(aExcludeIMAccounts) { } // Sort the accounts else will respect the order in mail.accountmanager.accounts - if (Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", true)) { + if (!Services.prefs.getBoolPref("mail.accountmanager.accounts.ordered", false)) { accountList = accountList.sort(compareAccounts); } diff --git a/mailnews/mailnews.js b/mailnews/mailnews.js index afb5ac7f2..49ac33827 100644 --- a/mailnews/mailnews.js +++ b/mailnews/mailnews.js @@ -431,7 +431,7 @@ pref("mail.default_sendlater_uri", "mailbox://nobody@Local%20Folders/Unsent%20Me pref("mail.smtpservers", ""); pref("mail.accountmanager.accounts", ""); -pref("mail.accountmanager.accounts.ordered", true); +pref("mail.accountmanager.accounts.ordered", false); pref("mail.accountmanager.localfolderfirst", false); // Last used account key value -- cgit v1.2.3