[Pkg-mozext-commits] [compactheader] 324/441: Version 2.0.1beta1: Fix bug with definition of LOGLEVEL, add mozmill tests for folder-display to verify fix.

[David Prévot]

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

taffit pushed a commit to branch master
in repository compactheader.

commit ebc64882799db0cae82894381b5e42d5c38cb60e
Author: Joachim.Herb at gmx.de <Joachim.Herb at gmx.de>
Date:   Mon Jan 2 14:15:29 2012 +0100

    Version 2.0.1beta1: Fix bug with definition of LOGLEVEL, add mozmill tests
    for folder-display to verify fix.
---
 chrome/CompactHeader/content/debug.js   |  8 ++++----
 chrome/CompactHeader/content/toolbar.js | 10 ++++++----
 install.rdf                             |  4 ++--
 test/executeTests.pl                    |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/chrome/CompactHeader/content/debug.js b/chrome/CompactHeader/content/debug.js
index fed9dec..f049f04 100644
--- a/chrome/CompactHeader/content/debug.js
+++ b/chrome/CompactHeader/content/debug.js
@@ -51,11 +51,11 @@ org.mozdev.compactHeader.debug = function() {
   var aConsoleService = Components.classes["@mozilla.org/consoleservice;1"]
                                            .getService(Components.interfaces.nsIConsoleService);
 
-  var LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
-  var gCurrentLogLevel = LOGLEVEL.info; // TODO: Set to info
+  pub.LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
+  var gCurrentLogLevel = pub.LOGLEVEL.info; // TODO: Set to info
 
   pub.log = function(str, logLevel) {
-    if (!logLevel) var logLevel = LOGLEVEL.debug;
+    if (!logLevel) var logLevel = pub.LOGLEVEL.debug;
     if (logLevel >= gCurrentLogLevel) {
       aConsoleService.logStringMessage(Date() + " CH: " + str);
     }
@@ -72,7 +72,7 @@ org.mozdev.compactHeader.debug = function() {
     } catch(e) {
     } finally {
     }
-    pub.log("Current logLevel: " + gCurrentLogLevel, LOGLEVEL.error)
+    pub.log("Current logLevel: " + gCurrentLogLevel, pub.LOGLEVEL.error)
     return gCurrentLogLevel;
   };
 
diff --git a/chrome/CompactHeader/content/toolbar.js b/chrome/CompactHeader/content/toolbar.js
index 1bfe8e6..d2bc407 100644
--- a/chrome/CompactHeader/content/toolbar.js
+++ b/chrome/CompactHeader/content/toolbar.js
@@ -47,7 +47,6 @@ if(!org.mozdev.compactHeader) org.mozdev.compactHeader = {};
 
 org.mozdev.compactHeader.toolbar = function() {
   var pub = {};
-  var LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
 
   var cohePrefBranch = Components.classes["@mozilla.org/preferences-service;1"]
                                           .getService(Components.interfaces.nsIPrefService)
@@ -81,7 +80,8 @@ org.mozdev.compactHeader.toolbar = function() {
         return gToolboxes[i];
       }
     }
-    org.mozdev.compactHeader.debug.log("orient failed " + targetPos + " " + targetHeader, LOGLEVEL.warn);
+    org.mozdev.compactHeader.debug.log("orient failed " + targetPos + " " + targetHeader,
+      org.mozdev.compactHeader.debug.LOGLEVEL.warn);
     return null;
   }
 
@@ -144,7 +144,8 @@ org.mozdev.compactHeader.toolbar = function() {
           hdrToolbar.currentSet = currentSet;
         }
       }
-    }
+    org.mozdev.compactHeader.debug.log("fillToolboxPalette stop");
+    };
 
     var buttonsRemove = ["hdrForwardButton", "hdrArchiveButton",
                          "hdrReplyToSenderButton"];//, "hdrReplyButton",
@@ -521,7 +522,8 @@ org.mozdev.compactHeader.toolbar = function() {
 
     var hdrViewToolbox = document.getElementById("header-view-toolbox");
     if (!hdrViewToolbox) {
-      org.mozdev.compactHeader.debug.log("no header-view-toolbox!", LOGLEVEL.warn);
+      org.mozdev.compactHeader.debug.log("no header-view-toolbox!",
+        org.mozdev.compactHeader.debug.LOGLEVEL.warn);
       return;
     }
 
diff --git a/install.rdf b/install.rdf
index 98ef60a..2000d51 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
 
 	<RDF:Description about="urn:mozilla:install-manifest">
 		<em:name>CompactHeader</em:name>
-		<em:version>2.0.0</em:version>
+		<em:version>2.0.1beta1</em:version>
 		<em:description>Add ability to reduce header size to one or two lines. Linkify subjects in RSS feeds.</em:description>
 		<em:creator>Joachim Herb</em:creator>
 		<em:contributor>Zamula</em:contributor>
@@ -24,7 +24,7 @@
 			<RDF:Description>
 				<em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
 				<em:minVersion>8.0</em:minVersion>
-				<em:maxVersion>11.0a1</em:maxVersion>
+				<em:maxVersion>12.0a1</em:maxVersion>
 			</RDF:Description>
 		</em:targetApplication>
 	</RDF:Description>
diff --git a/test/executeTests.pl b/test/executeTests.pl
index 889c0a2..b31945f 100644
--- a/test/executeTests.pl
+++ b/test/executeTests.pl
@@ -118,7 +118,6 @@ while (my $line = <F>)
     $version = $1;
 
     next if (($testversion) && ($version ne $testversion));
-    # next if ($version lt "9.0");
 
     # $ftppath =~ s/_VER_/${version}/g;
     $app =~ s/_VER_/${version}/g;
@@ -218,6 +217,7 @@ foreach my $pid (@children) {
   my $comp_apps = join(",", @compatibility_apps);
 #    print "$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t compactheader 2>&1\n";
   $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t compactheader 2>&1`;
+  $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi -t folder-display 2>&1`;
   $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi,$comp_apps -t compactheader/test-compactheader-toolbar.js 2>&1`;
   $log = $log . `$python runtest.py --binary=../thunderbird/$appbin -a $xpi,$comp_apps -t compactheader/test-compactheader-preferences.js 2>&1`;
 

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