moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2024-11-10 19:15:08 -05:00
Code Issues Releases Wiki Activity

fix mail server sorting

Browse Source
This commit is contained in:
foudfou 2011-09-27 01:46:45 +02:00
parent 1aa9e809de
commit 10e8bb01cf
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/FiretrayMessaging.jsm
View File

@ -30,7 +30,7 @@ if ("undefined" == typeof(firetray)) {
firetray.Messaging = {
// TODO: turn into pref
// TODO: turn into pref.
SERVER_TYPES: {
"pop3": { order: 1, excluded: false },
"imap": { order: 1, excluded: false },
@ -133,7 +133,6 @@ firetray.Messaging = {
.replace("#1", this._unreadMsgCount);;
firetray.IconLinux.setTooltip(localizedMessage);
} else {
ERROR("negative unread messages' count ?"); // should never happen
throw "negative message count"; // should never happen
}
@ -160,33 +159,36 @@ firetray.Messaging.Accounts.prototype.__iterator__ = function() {
let accounts = MailServices.accounts.accounts;
LOG("sortByTypeAndName="+this.sortByTypeAndName);
// NOTE: sort() not provided by nsIMsgAccountManager.accounts
// (nsISupportsArray, nsICollection). Should be OK to re-build a JS-Array for
// few accounts
/* NOTE: sort() not provided by nsIMsgAccountManager.accounts
(nsISupportsArray, nsICollection). Should be OK to re-build a JS-Array for
few accounts */
let accountServers = [];
for (let i = 0; i < accounts.Count(); i++) {
let account = accounts.QueryElementAt(i, Ci.nsIMsgAccount);
let accountServer = account.incomingServer;
// checks
if (typeof(firetray.Messaging.SERVER_TYPES[accountServer.type]) === "undefined")
throw "mail server type for '"+accountServer.prettyName+"' not defined";
if (typeof(firetray.Messaging.SERVER_TYPES[accountServer.type].order) === "undefined")
throw "mail server type for '"+accountServer.prettyName+"' missing 'order' definition";
if (typeof(firetray.Messaging.SERVER_TYPES[accountServer.type].excluded) === "undefined")
throw "mail server type for '"+accountServer.prettyName+"' missing 'excluded' definition";
accountServers[i] = accountServer;
}
if (this.sortByTypeAndName) {
accountServers.sort(function(a,b) {
if (!firetray.Messaging.SERVER_TYPES[a.type]
|| !firetray.Messaging.SERVER_TYPES[b.type]) {
ERROR("type '"+a.type+"' not defined in type order");
return 0;
}
if (firetray.Messaging.SERVER_TYPES[a.type].order
< firetray.Messaging.SERVER_TYPES[b.type].order)
return -1;
if (firetray.Messaging.SERVER_TYPES[a.type].order
> firetray.Messaging.SERVER_TYPES[b.type].order)
return 1;
if (a.name < b.name)
if (a.prettyName < b.prettyName)
return -1;
if (a.name > b.name)
if (a.prettyName > b.prettyName)
return 1;
return 0; // no sorting
});