[Pkg-mozext-commits] [firetray] 284/399: experimental handling of Exquilla accounts

[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 aaef6a1544a625732e3eb004991f9259037e324e
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Wed Aug 29 11:46:12 2012 +0200

    experimental handling of Exquilla accounts
---
 src/defaults/preferences/prefs.js |    2 +-
 src/modules/FiretrayHandler.jsm   |   14 ++++++++++++--
 src/modules/FiretrayMessaging.jsm |    5 ++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js
index bdce715..13386fe 100644
--- a/src/defaults/preferences/prefs.js
+++ b/src/defaults/preferences/prefs.js
@@ -32,4 +32,4 @@ pref("extensions.firetray.folder_count_recursive", true);
 // 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
+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}, "exquilla":{"order":6,"excluded":true}}, "excludedAccounts": [] }'); // JSON
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index de531ad..7529512 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -82,6 +82,7 @@ firetray.Handler = {
     VersionChange.addHook(["install", "upgrade", "reinstall"], firetray.VersionChangeHandler.showReleaseNotes);
     VersionChange.addHook(["upgrade", "reinstall"], firetray.VersionChangeHandler.tryEraseOldOptions);
     VersionChange.addHook(["upgrade", "reinstall"], firetray.VersionChangeHandler.correctMailNotificationType);
+    VersionChange.addHook(["upgrade", "reinstall"], firetray.VersionChangeHandler.correctMailServerTypes);
     VersionChange.applyHooksAndWatchUninstall();
 
     firetray.StatusIcon.init();
@@ -363,8 +364,6 @@ firetray.VersionChangeHandler = {
 
   showReleaseNotes: function() {
     firetray.VersionChangeHandler.openTab(FIRETRAY_SPLASH_PAGE+"#v"+FIRETRAY_VERSION);
-    firetray.VersionChangeHandler.tryEraseOldOptions();
-    firetray.VersionChangeHandler.correctMailNotificationType();
   },
 
   openTab: function(url) {
@@ -438,6 +437,17 @@ firetray.VersionChangeHandler = {
         FIRETRAY_NOTIFICATION_NEWMAIL_ICON);
       F.WARN("mail notification type set to newmail icon.");
     }
+  },
+
+  correctMailServerTypes: function() {
+    let mailAccounts = firetray.Utils.getObjPref('mail_accounts');
+    let serverTypes = mailAccounts["serverTypes"];
+    if (!serverTypes["exquilla"]) {
+      serverTypes["exquilla"] = {"order":6,"excluded":true};
+      let prefObj = {"serverTypes":serverTypes, "excludedAccounts":mailAccounts["excludedAccounts"]};
+      firetray.Utils.setObjPref('mail_accounts', prefObj);
+      F.WARN("mail server types corrected");
+    }
   }
 
 };
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index 8938090..be9e6be 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -274,7 +274,10 @@ firetray.Messaging = {
     try {
       let accounts = new this.Accounts();
       for (let accountServer in accounts) {
-        if (accountServer.type === 'im') continue; // IM messages are counted elsewhere
+        if (!serverTypes[accountServer.type]) {
+          F.WARN("'"+accountServer.type+"' server type is not handled");
+          continue;
+        }
         F.LOG("is servertype excluded: "+serverTypes[accountServer.type].excluded+", account exclusion index: "+excludedAccounts.indexOf(accountServer.key));
         if (serverTypes[accountServer.type].excluded ||
             (excludedAccounts.indexOf(accountServer.key) >= 0))

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