[Pkg-mozext-commits] [firetray] 100/399: * options UI: show folder exceptions as "not included" * bump maxVersion for seamonkey to 2.6.*

[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 27360545d355982435b51396ee05e1a7aaf890ae
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Thu Nov 24 22:56:25 2011 +0100

    * options UI: show folder exceptions as "not included"
    * bump maxVersion for seamonkey to 2.6.*
---
 src/chrome/content/options.js       |   15 +++++++++++----
 src/chrome/locale/en-US/options.dtd |    4 ++--
 src/install.rdf                     |    2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index d1f11d3..9e4d32f 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -133,6 +133,10 @@ firetray.UIOptions = {
 	  }
   },
 
+  /**
+   * NOTE: folder exceptions for unread messages count are *stored* in
+   * preferences as excluded, but *shown* as "not included"
+   */
   populateExcludedFoldersList: function() {
     let excludedFoldersList = document.getElementById('excluded_folders_list');
 
@@ -143,7 +147,7 @@ firetray.UIOptions = {
       let item = excludedFoldersList.appendItem(localizedFolderType, folderType);
       item.setAttribute("observes", "broadcaster-notification-disabled");
       LOG("folder: "+folderType);
-      if (FLDRS_UNINTERESTING[folderType] & prefExcludedFoldersFlags)
+      if (!(FLDRS_UNINTERESTING[folderType] & prefExcludedFoldersFlags))
         excludedFoldersList.addItemToSelection(item); // doesn't trigger onselect
     }
   },
@@ -153,9 +157,12 @@ firetray.UIOptions = {
 
     LOG("LAST SELECTED: "+excludedFoldersList.currentItem.label);
     let excludedFoldersFlags = null;
-    for(let i = 0; i < excludedFoldersList.selectedCount; i++) {
-      let folderType = excludedFoldersList.getSelectedItem(i).value;
-      excludedFoldersFlags |= FLDRS_UNINTERESTING[folderType];
+    for(let i = 0; i < excludedFoldersList.itemCount; i++) {
+      let folder = excludedFoldersList.getItemAtIndex(i);
+      if (folder.selected)
+        excludedFoldersFlags &= ~FLDRS_UNINTERESTING[folder.value];
+      else
+        excludedFoldersFlags |= FLDRS_UNINTERESTING[folder.value];
     }
     LOG("excluded folders flags: "+excludedFoldersFlags);
 
diff --git a/src/chrome/locale/en-US/options.dtd b/src/chrome/locale/en-US/options.dtd
index b443162..d14b1b8 100644
--- a/src/chrome/locale/en-US/options.dtd
+++ b/src/chrome/locale/en-US/options.dtd
@@ -29,8 +29,8 @@
 <!ENTITY choose "Choose">
 <!ENTITY choose.accesskey "O">
 
-<!ENTITY unread_count_folder_exceptions.label "Excluded special folders">
-<!ENTITY unread_count_folder_exceptions.tooltip "Excluded special folders for unread message count">
+<!ENTITY unread_count_folder_exceptions.label "Included special folders">
+<!ENTITY unread_count_folder_exceptions.tooltip "Included special folders for unread message count">
 <!ENTITY excluded_folders_list.tooltip "Use CTRL + left click to select/deselect folders for unread message count">
 <!ENTITY unread_count_account_exceptions.label "Included accounts">
 <!ENTITY unread_count_account_exceptions.tooltip "Included accounts for unread message count">
diff --git a/src/install.rdf b/src/install.rdf
index 10927bc..3c53aeb 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -35,7 +35,7 @@
       <Description>
         <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
         <em:minVersion>2.1</em:minVersion>
-        <em:maxVersion>2.4.*</em:maxVersion>
+        <em:maxVersion>2.6.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

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