[Pkg-mozext-commits] [firetray] 396/399: fix Accounts() generator (bug introduced in 65d175)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit 1fc3b93bd71d4b7506dc3c3f8802d981ba979645
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sun Oct 27 18:35:33 2013 +0100

    fix Accounts() generator (bug introduced in 65d175)
---
 src/modules/FiretrayMessaging.jsm            |   13 +++++++------
 src/modules/linux/FiretrayChatStatusIcon.jsm |    2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index f340674..38868a6 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -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');
diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index fda634d..1c4358a 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -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();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git