moparisthebest
/
FireTray
mirror of https://github.com/moparisthebest/FireTray
1
0
Fork 0
Code Issues Releases Wiki Activity

fix Accounts() generator (bug introduced in 65d175)

This commit is contained in:
foudfou 2013-10-27 18:35:33 +01:00
parent 590c257788
commit 1fc3b93bd7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/modules/FiretrayMessaging.jsm
View File

@ -240,7 +240,7 @@ firetray.Messaging = {
this.newMsgCount = 0;
let accounts = new this.Accounts();
for (let accountServer in accounts) { // nsIMsgAccount
for (let accountServer in accounts) { // nsIMsgIncomingServer
if (accountServer.type === FIRETRAY_ACCOUNT_SERVER_TYPE_IM) {
continue; // IM messages are counted elsewhere
@ -337,8 +337,10 @@ firetray.Messaging = {
/**
* Accounts Iterator/Generator for iterating over account servers
* Accounts Iterator/Generator for iterating over all account servers.
* NOTE: MailServices.accounts.allServers exludes hidden and IM servers
* @param sortByTypeAndName: boolean
* @return a generator over all nsIMsgIncomingServer including hidden and IM ones
*/
firetray.Messaging.Accounts = function(sortByTypeAndName) {
if (typeof(sortByTypeAndName) == "undefined") {
@ -351,7 +353,6 @@ firetray.Messaging.Accounts = function(sortByTypeAndName) {
this.sortByTypeAndName = sortByTypeAndName;
};
firetray.Messaging.Accounts.prototype.__iterator__ = function() {
log.debug("sortByTypeAndName="+this.sortByTypeAndName);
@ -359,9 +360,9 @@ firetray.Messaging.Accounts.prototype.__iterator__ = function() {
(nsISupportsArray or nsIArray if xulrunner >= 20.0). Should be OK to
re-build a JS-Array for few accounts */
let accountServers = [];
for (let accountServer in fixIterator(MailServices.accounts.allServers,
Ci.nsIMsgIncomingServer)) {
accountServers.push(accountServer);
for (let accountServer in fixIterator(MailServices.accounts.accounts,
Ci.nsIMsgAccount)) {
accountServers.push(accountServer.incomingServer);
}
let mailAccounts = firetray.Utils.getObjPref('mail_accounts');

2
src/modules/linux/FiretrayChatStatusIcon.jsm
View File

@ -50,7 +50,7 @@ firetray.ChatStatusIcon = {
get isBlinking () {return (firetray.Chat.convsToAcknowledge.length() > 0);},
init: function() {
if (!firetray.Handler.inMailApp) throw "ChatStatusIcon for mail app only";
if (!firetray.Handler.appHasChat) throw "ChatStatusIcon for chat app only";
if (!firetray.GtkIcons.initialized) throw "GtkIcons should have been initialized by StatusIcon";
this.trayIcon = gtk.gtk_status_icon_new();