wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-07 15:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into custom

Browse source
This commit is contained in:
Roy Tam 2020-07-31 08:12:40 +08:00
commit 61e493cf30
69 changed files with 2727 additions and 2128 deletions
Download patch file Download diff file Expand all files Collapse all files

13
mailnews/base/util/folderUtils.jsm
View file

@ -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);
}
return 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;
}
/**

2
mailnews/mailnews.js
View file

@ -431,6 +431,8 @@ 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.localfolderfirst", false);
// Last used account key value
pref("mail.account.lastKey", 0);