[Pkg-mozext-commits] [firetray] 221/399: add ability to exclude virtual forlders from message count

[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 b3139707813fdb489cfbeba76aa3a36ab0118f82
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Thu Apr 5 21:34:36 2012 +0200

    add ability to exclude virtual forlders from message count
---
 src/chrome/content/options.js              |    4 +++-
 src/chrome/locale/en-US/options.properties |    1 +
 src/defaults/preferences/prefs.js          |    4 ++--
 src/modules/FiretrayMessaging.jsm          |    3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 3fd0888..3c52a74 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -220,8 +220,10 @@ var firetrayUIOptions = {
       let item = excludedFoldersList.appendItem(localizedFolderType, folderType);
       item.setAttribute("observes", "broadcaster-notification-disabled");
       F.LOG("folder: "+folderType);
-      if (!(FLDRS_UNINTERESTING[folderType] & prefExcludedFoldersFlags))
+      if (!(FLDRS_UNINTERESTING[folderType] & prefExcludedFoldersFlags)) {
+        excludedFoldersList.ensureElementIsVisible(item); // bug 326445
         excludedFoldersList.addItemToSelection(item); // doesn't trigger onselect
+      }
     }
   },
 
diff --git a/src/chrome/locale/en-US/options.properties b/src/chrome/locale/en-US/options.properties
index 70c88e2..8c87750 100644
--- a/src/chrome/locale/en-US/options.properties
+++ b/src/chrome/locale/en-US/options.properties
@@ -5,3 +5,4 @@ Queue=Queue
 SentMail=SentMail
 Templates=Templates
 Trash=Trash
+Virtual=Virtual
diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index bc296a5..44563e0 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -21,7 +21,7 @@ pref("extensions.firetray.mail_notification_enabled", true);
 pref("extensions.firetray.mail_notification_type", 0);
 pref("extensions.firetray.icon_text_color", "#000000");
 pref("extensions.firetray.custom_mail_icon", "");
-// Ci.nsMsgFolderFlags.Archive|Drafts|Junk|Queue|SentMail|Trash
-pref("extensions.firetray.excluded_folders_flags", 1077956352);
+// Ci.nsMsgFolderFlags.Archive|Drafts|Junk|Queue|SentMail|Trash|Virtual
+pref("extensions.firetray.excluded_folders_flags", 1077956384);
 // exposed in 1 tree, hence 2 branches: serverTypes, excludedAccounts
 pref("extensions.firetray.mail_accounts", '{ "serverTypes": {"pop3":{"order":1,"excluded":false}, "imap":{"order":1,"excluded":false}, "movemail":{"order":2,"excluded":true}, "none":{"order":3,"excluded":false}, "rss":{"order":4,"excluded":true}, "nntp":{"order":5,"excluded":true}}, "excludedAccounts": [] }'); // JSON
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index 4fcaf58..5100bf9 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -17,7 +17,8 @@ const FLDRS_UNINTERESTING = {
   Queue:     Ci.nsMsgFolderFlags.Queue,
   SentMail:  Ci.nsMsgFolderFlags.SentMail,
   Templates: Ci.nsMsgFolderFlags.Templates,
-  Trash:     Ci.nsMsgFolderFlags.Trash
+  Trash:     Ci.nsMsgFolderFlags.Trash,
+  Virtual:   Ci.nsMsgFolderFlags.Virtual
 };
 
 

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