diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-07-29 14:30:24 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-29 14:30:24 +0000 |
| commit | a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57 (patch) | |
| tree | 9df45decf2d7d940ff19641adea50fe7122805f7 /mailnews/base | |
| parent | 86b184b957ea2ce31e5ffc376e90cbc537963367 (diff) | |
| parent | 2ee2ca7dfb0913eef79708dc4100f87b9557e128 (diff) | |
| download | UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar.gz UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar.lz UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar.xz UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.zip | |
Merge branch 'redwood' into release
Diffstat (limited to 'mailnews/base')
| -rw-r--r-- | mailnews/base/util/folderUtils.jsm | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mailnews/base/util/folderUtils.jsm b/mailnews/base/util/folderUtils.jsm index 62fb7700b..f549bf655 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,18 @@ 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", false)) { + 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.sort(compareAccounts); + return accountList; } /** |