[Pkg-mozext-commits] [firetray] 255/399: Move check for excluded folders flag

[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 906e64d25339246ed826f5eb07d59fec4e204986
Author: Roland Tapken <rt at tasmiro.de>
Date:   Thu Jun 7 13:10:46 2012 +0200

    Move check for excluded folders flag
    
    The check for excluded_folders_flag was moved from countMessages
    to unreadMsgCountIterate and newMsgCountIterate. This should fix
    https://github.com/foudfou/FireTray/issues/44
---
 src/modules/FiretrayMessaging.jsm |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index 7bcd33b..34aac0b 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -232,8 +232,6 @@ firetray.Messaging = {
     F.LOG("mail accounts from pref: "+JSON.stringify(mailAccounts));
     let serverTypes = mailAccounts["serverTypes"];
     let excludedAccounts = mailAccounts["excludedAccounts"];
-    let excludedFoldersFlags = firetray.Utils.prefService
-      .getIntPref("excluded_folders_flags");
 
     let msgCount = 0;
     try {
@@ -249,9 +247,7 @@ firetray.Messaging = {
           let subFolders = rootFolder.subFolders;
           while(subFolders.hasMoreElements()) {
             let folder = subFolders.getNext().QueryInterface(Ci.nsIMsgFolder);
-            if (!(folder.flags & excludedFoldersFlags)) {
-              msgCount = folderCountFunction(folder, msgCount);
-            }
+            msgCount = folderCountFunction(folder, msgCount);
           }
         }
       }
@@ -264,13 +260,11 @@ firetray.Messaging = {
 
   unreadMsgCountIterate: function(folder, accumulator) {
     let folderCountFunctionName = 'getNumUnread';
-    let folderRecursive = firetray.Utils.prefService.getBoolPref("folder_count_recursive");
     let onlyFavorites = firetray.Utils.prefService.getBoolPref("only_favorite_folders");
+    let excludedFoldersFlags = firetray.Utils.prefService.getIntPref("excluded_folders_flags");
 
-    if (folderRecursive && onlyFavorites) {
-      // need to handle each folder on it's own due to respect favorite flag
-      folderRecursive = false;
-
+    if (folder.hasSubFolders && firetray.Utils.prefService.getBoolPref("folder_count_recursive")) {
+      // need to handle each folder on it's own to respect folder flags
       let subFolders = folder.subFolders;
       while(subFolders.hasMoreElements()) {
         let subFolder = subFolders.getNext().QueryInterface(Ci.nsIMsgFolder);
@@ -279,8 +273,10 @@ firetray.Messaging = {
     }
 
     let folderUnreadMsgCount = 0;
-    if (!onlyFavorites || (folder.flags & Ci.nsMsgFolderFlags.Favorite)) {
-      folderUnreadMsgCount = folder[folderCountFunctionName](folderRecursive);
+    if (!(folder.flags & excludedFoldersFlags)) {
+      if (!onlyFavorites || folder.flags & Ci.nsMsgFolderFlags.Favorite) {
+        folderUnreadMsgCount = folder[folderCountFunctionName](false);
+      }
     }
 
     F.LOG(folder.prettyName+" "+folderCountFunctionName+"="+folderUnreadMsgCount);
@@ -298,9 +294,13 @@ firetray.Messaging = {
     }
 
     let onlyFavorites = firetray.Utils.prefService.getBoolPref("only_favorite_folders");
-    if (!onlyFavorites || (folder.flags & Ci.nsMsgFolderFlags.Favorite)) {
-      accumulator = firetray.Messaging.addHasNewMessages(folder, accumulator);
+    let excludedFoldersFlags = firetray.Utils.prefService.getIntPref("excluded_folders_flags");
+    if (!(folder.flags & excludedFoldersFlags)) {
+      if (!onlyFavorites || folder.flags & Ci.nsMsgFolderFlags.Favorite) {
+        accumulator = firetray.Messaging.addHasNewMessages(folder, accumulator);
+      }
     }
+
     return accumulator;
   },
 

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