[Pkg-mozext-commits] [compactheader] 245/441: Add (hidden) preference to set debug(log)Level

[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 b22b8194868f6800cb6ef1a2201c45936ae19f47
Author: joachim <none at none>
Date:   Thu Aug 4 00:36:48 2011 +0200

    Add (hidden) preference to set debug(log)Level
    
    --HG--
    branch : preferences
---
 chrome/CompactHeader/content/compactHeaderOverlay.js |  9 ++++-----
 chrome/CompactHeader/content/debug.js                | 11 +++++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/chrome/CompactHeader/content/compactHeaderOverlay.js b/chrome/CompactHeader/content/compactHeaderOverlay.js
index 634240b..9519f50 100644
--- a/chrome/CompactHeader/content/compactHeaderOverlay.js
+++ b/chrome/CompactHeader/content/compactHeaderOverlay.js
@@ -568,6 +568,7 @@ org.mozdev.compactHeader.pane = function() {
 
     observe: function(aSubject, aTopic, aData)
     {
+      org.mozdev.compactHeader.debug.log("hit prefObserver");
       if(aTopic != "nsPref:changed") return;
       // aSubject is the nsIPrefBranch we're observing (after appropriate QI)
       // aData is the name of the pref that's been changed (relative to aSubject)
@@ -581,14 +582,13 @@ org.mozdev.compactHeader.pane = function() {
     }
   }
 
-  myPrefObserverHeaderSize.register();
-
   function coheCheckFirstRun() {
     var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
                                      .getService(Components.interfaces.nsIXULAppInfo);
     var versionChecker = Components.classes["@mozilla.org/xpcom/version-comparator;1"]
                                             .getService(Components.interfaces.nsIVersionComparator);
 //    org.mozdev.compactHeader.debug.log("first run 0");
+    var debugLevel = org.mozdev.compactHeader.debug.getLogLevel();
     if(versionChecker.compare(appInfo.version, "3.2a1pre") < 0) {
       org.mozdev.compactHeader.debug.log("firstrun 1");
       org.mozdev.compactHeader.toolbar.populateEmptyToolbar();
@@ -600,12 +600,10 @@ org.mozdev.compactHeader.pane = function() {
         return;
       }
 
-      var debugLevel = org.mozdev.compactHeader.debug.getLogLevel();
       cohe.current = cohe.gExtensionManager.getItemForID(COHE_EXTENSION_UUID).version;
       try{
         cohe.version = cohePrefBranch.getCharPref("version");
         cohe.firstrun = cohePrefBranch.getBoolPref("firstrun");
-        debugLevel = cohePrefBranch.getIntPref("debugLevel");
       } catch(e) {
       } finally {
         //check for first run
@@ -620,7 +618,6 @@ org.mozdev.compactHeader.pane = function() {
           // XXX
         }
         cohe.firstrun = false;
-        org.mozdev.compactHeader.debug.setLogLevel(debugLevel);
         cohePrefBranch.setIntPref("debugLevel", debugLevel);
       }
     }
@@ -671,6 +668,8 @@ org.mozdev.compactHeader.pane = function() {
     //}
     org.mozdev.compactHeader.debug.log("before register");
     coheUninstallObserver.register();
+    myPrefObserverHeaderSize.register();
+    org.mozdev.compactHeader.debug.log("register PrefObserver");
     org.mozdev.compactHeader.debug.log("after register");
   }
 
diff --git a/chrome/CompactHeader/content/debug.js b/chrome/CompactHeader/content/debug.js
index 9808b2a..15545bd 100644
--- a/chrome/CompactHeader/content/debug.js
+++ b/chrome/CompactHeader/content/debug.js
@@ -54,7 +54,7 @@ org.mozdev.compactHeader.debug = function() {
                                            .getService(Components.interfaces.nsIConsoleService);
 
   var LOGLEVEL = {"debug": 0, "info":1, "warn": 2, "error": 3};
-  var gCurrentLogLevel = LOGLEVEL.debug; // TODO: Set to info
+  var gCurrentLogLevel = LOGLEVEL.info; // TODO: Set to info
 
   pub.log = function(str, logLevel) {
     if (!logLevel) var logLevel = LOGLEVEL.debug;
@@ -62,12 +62,19 @@ org.mozdev.compactHeader.debug = function() {
       aConsoleService.logStringMessage(Date() + " CH: " + str);
     }
   };
-  
+
   pub.setLogLevel = function(logLevel) {
     gCurrentLogLevel = logLevel;
+    cohePrefBranch.setIntPref("debugLevel", debugLevel);
   };
 
   pub.getLogLevel = function() {
+    try{
+      gCurrentLogLevel = cohePrefBranch.getIntPref("debugLevel");
+    } catch(e) {
+    } finally {
+    }
+    pub.log("Current logLevel: " + gCurrentLogLevel, LOGLEVEL.error)
     return gCurrentLogLevel;
   };
 

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