moparisthebest/FireTray
1
0
Fork 0
mirror of https://github.com/moparisthebest/FireTray synced 2025-03-11 14:59:41 -04:00
Code Issues Releases Wiki Activity

nsISupportsArray replaced by nsIArray (Bug 820377)

Browse Source
This commit is contained in:
foudfou 2012-12-30 22:43:42 +01:00
parent 2215aa43d1
commit 6441cef235
1 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/modules/FiretrayMessaging.jsm
View File

@ -350,19 +350,48 @@ firetray.Messaging.Accounts = function(sortByTypeAndName) {
this.sortByTypeAndName = sortByTypeAndName;
};
// https://bugzilla.mozilla.org/show_bug.cgi?id=820377
firetray.Messaging._accountsRef = MailServices.accounts.accounts;
if (firetray.Messaging._accountsRef instanceof Ci.nsIArray) {
function _getAccountServersAsJSArray() {
let accountServers = [];
let accEnumerator = firetray.Messaging._accountsRef.enumerate();
while (accEnumerator.hasMoreElements()) {
let account = accEnumerator.getNext().QueryInterface(Ci.nsIMsgAccount);
log.debug("account="+account);
let accountServer = account.incomingServer;
accountServers.push(accountServer);
}
log.debug("accountServers="+accountServers.length);
return accountServers;
}
} else if (firetray.Messaging._accountsRef instanceof Ci.nsISupportsArray) {
function _getAccountServersAsJSArray() {
let accountServers = [];
for (let i=0, len=firetray.Messaging._accountsRef.Count(); i<len; ++i) {
let account = firetray.Messaging._accountsRef.QueryElementAt(i, Ci.nsIMsgAccount);
let accountServer = account.incomingServer;
accountServers[i] = accountServer;
}
log.debug("accountServers="+accountServers.length);
return accountServers;
}
} else {
throw TypeError("unknown type for MailServices.accounts.accounts");
}
firetray.Messaging.Accounts.prototype.__iterator__ = function() {
let accounts = MailServices.accounts.accounts;
log.debug("sortByTypeAndName="+this.sortByTypeAndName);
/* 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, len=accounts.Count(); i<len; ++i) {
let account = accounts.QueryElementAt(i, Ci.nsIMsgAccount);
let accountServer = account.incomingServer;
accountServers[i] = accountServer;
}
(nsISupportsArray or nsIArray if xulrunner >= 20.0). Should be OK to
re-build a JS-Array for few accounts */
let accountServers = _getAccountServersAsJSArray();
let mailAccounts = firetray.Utils.getObjPref('mail_accounts');
let serverTypes = mailAccounts["serverTypes"];