[Pkg-mozext-commits] [nostalgy] 222/235: Fix for TB >= 20.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository nostalgy.

commit 4537c8eb32200aad297a8c696e9aa036a12ba160
Author: alain.frisch <alain.frisch at 56b81dcf-5a2f-0410-9db0-014be2e416ff>
Date:   Mon Mar 25 09:11:53 2013 +0000

    Fix for TB >= 20.
    
    git-svn-id: http://nostalgy.googlecode.com/svn/trunk@222 56b81dcf-5a2f-0410-9db0-014be2e416ff
---
 CHANGES            |    3 +++
 content/folders.js |   34 ++++++++++++++++++++++------------
 install.rdf        |    4 ++--
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7311cbb..1e1b69f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+0.2.31
+  - Fix for TB >= 20 (thanks to Aaron Solochek)
+
 0.2.30
   - Fix scrolling messages with Ctrl Up/Down.
   - Integrate patch from Gilles Orsini to avoid problem with 'Tasks & mails' extension.
diff --git a/content/folders.js b/content/folders.js
index 9e84cea..f438d7e 100644
--- a/content/folders.js
+++ b/content/folders.js
@@ -415,18 +415,28 @@ function NostalgyIterateFoldersAllServers(f) {
  var servers= amService.allServers;
  var seen = { };
  var i;
-
- for (i = 0; i < servers.Count(); i++) {
-  var server = servers.GetElementAt(i).
-               QueryInterface(Components.interfaces.nsIMsgIncomingServer);
-  var root = server.rootMsgFolder;
-  var n = root.prettyName;
-  if (seen[n]) {
-    // Prevent duplicate folders in case of locally stored POP3 accounts
-  } else {
-    seen[n] = true;
-    NostalgyIterateSubfolders(root,f);
-  }
+ var nservers;
+
+ if (servers.length) nservers = servers.length;  /* TB >= 20 */
+ else if (servers.Count) nservers = servers.Count();  /* TB < 20 */
+ else alert("NOSTALGY: cannot determine server count");
+
+ for (i = 0; i < nservers; i++) {
+     var server;
+     if (servers.GetElementAt) /* TB < 20 */
+         server = servers.GetElementAt(i).QueryInterface(Components.interfaces.nsIMsgIncomingServer);
+     else if (servers.queryElementAt) /* TB >= 20 */
+         server = servers.queryElementAt(i,Components.interfaces.nsIMsgIncomingServer);
+     else alert("NOSTALGY: cannot access server");
+
+     var root = server.rootMsgFolder;
+     var n = root.prettyName;
+     if (seen[n]) {
+         // Prevent duplicate folders in case of locally stored POP3 accounts
+     } else {
+         seen[n] = true;
+         NostalgyIterateSubfolders(root,f);
+     }
  }
 }
 
diff --git a/install.rdf b/install.rdf
index 5802f53..d254814 100644
--- a/install.rdf
+++ b/install.rdf
@@ -5,7 +5,7 @@
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="nostalgy at alain.frisch"
                    em:name="Nostalgy"
-                   em:version="0.2.30"
+                   em:version="0.2.31"
                    em:creator="Alain Frisch"
                    em:description="Adds shortcuts to change folder, move message, with folder completion"
                    em:homepageURL="http://alain.frisch.fr/soft_mozilla.html"
@@ -17,7 +17,7 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>1.5</em:minVersion>
-        <em:maxVersion>12.*</em:maxVersion>
+        <em:maxVersion>20.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     <em:targetApplication>

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