[Pkg-mozext-commits] [firetray] 94/399: keep only one pref for excluded_folders : flags

[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 aac28deff7e5b4a56a802a0edc0f3ed868289b43
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Tue Nov 22 01:56:57 2011 +0100

    keep only one pref for excluded_folders : flags
---
 src/chrome/content/options.js       |   20 ++++++--------------
 src/chrome/content/options.xul      |    4 ++--
 src/chrome/locale/en-US/options.dtd |    2 +-
 src/defaults/preferences/prefs.js   |    3 ++-
 4 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index 270c5ff..48a7b35 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -128,39 +128,31 @@ firetray.UIOptions = {
   },
 
   populateExcludedFoldersList: function() {
-    let excludedFoldersList = document.getElementById('excluded_folders');
+    let excludedFoldersList = document.getElementById('excluded_folders_list');
 
-    let prefExcludedFolders = firetray.Utils.getArrayPref("excluded_folders");
-    LOG("pref excluded folder: "+prefExcludedFolders);
+    let prefExcludedFoldersFlags = firetray.Utils.prefService
+      .getIntPref("excluded_folders_flags");
     for(let folderType in FLDRS_UNINTERESTING) {
       let localizedFolderType = this.strings.getString(folderType);
 
       let item = excludedFoldersList.appendItem(localizedFolderType, folderType);
-      LOG("folder: "+folderType+", "+prefExcludedFolders.indexOf(folderType));
-      if (prefExcludedFolders.indexOf(folderType) > -1)
+      LOG("folder: "+folderType);
+      if (FLDRS_UNINTERESTING[folderType] & prefExcludedFoldersFlags)
         excludedFoldersList.addItemToSelection(item);
     }
   },
 
-  /**
-   * store to prefs excluded folder type names, and the computed flags (as soon as the
-   * change is applied)
-   */
   updateExcludedFoldersPref: function() {
-    let excludedFoldersList = document.getElementById('excluded_folders');
+    let excludedFoldersList = document.getElementById('excluded_folders_list');
 
     LOG("LAST SELECTED: "+excludedFoldersList.currentItem.label);
-    let excludedFolders = [];
     let excludedFoldersFlags = null;
     for(let i = 0; i < excludedFoldersList.selectedCount; i++) {
       let folderType = excludedFoldersList.getSelectedItem(i).value;
-      excludedFolders.push(folderType);
       excludedFoldersFlags |= FLDRS_UNINTERESTING[folderType];
     }
-    LOG("excluded folders: "+excludedFolders);
     LOG("excluded folders flags: "+excludedFoldersFlags);
 
-    firetray.Utils.setArrayPref("excluded_folders", excludedFolders);
     firetray.Utils.prefService.setIntPref("excluded_folders_flags",
                                           excludedFoldersFlags);
 
diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index a664dfe..d5b4bc9 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -92,8 +92,8 @@
             <caption label="&unread_count_folder_exceptions.label;"
                      tooltiptext="&unread_count_folder_exceptions.tooltip;" />
 
-            <listbox id="excluded_folders" rows="7" flex="1" seltype="multiple"
-                     tooltiptext="&excluded_folders.tooltip;"
+            <listbox id="excluded_folders_list" rows="7" flex="1" seltype="multiple"
+                     tooltiptext="&excluded_folders_list.tooltip;"
                      onselect="firetray.UIOptions.updateExcludedFoldersPref()"/>
           </groupbox>
 
diff --git a/src/chrome/locale/en-US/options.dtd b/src/chrome/locale/en-US/options.dtd
index 3053ec5..b108b5d 100644
--- a/src/chrome/locale/en-US/options.dtd
+++ b/src/chrome/locale/en-US/options.dtd
@@ -31,7 +31,7 @@
 
 <!ENTITY unread_count_folder_exceptions.label "Excluded special folders">
 <!ENTITY unread_count_folder_exceptions.tooltip "Excluded special folders for unread message count">
-<!ENTITY excluded_folders.tooltip "Use CTRL + left click to select/deslect folders for unread message count">
+<!ENTITY excluded_folders_list.tooltip "Use CTRL + left click to select/deslect 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/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index 07bd3c0..d3a92f5 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -12,6 +12,7 @@ pref("extensions.firetray.hides_on_minimize", true);
 pref("extensions.firetray.mail_notification", 1);
 pref("extensions.firetray.icon_text_color", "#000000");
 pref("extensions.firetray.custom_mail_icon", "");
-pref("extensions.firetray.excluded_folders", '["Archive", "Drafts", "Junk", "Queue", "SentMail", "Templates", "Trash"]');
+// Ci.nsMsgFolderFlags.Archive|Drafts|Junk|Queue|SentMail|Trash
+pref("extensions.firetray.excluded_folders_flags", 1077956352);
 // 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

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