[Pkg-mozext-commits] [requestpolicy] 150/280: utils.jsm: import AddonManager only in main proc

[David Prévot]

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

taffit pushed a commit to branch master
in repository requestpolicy.

commit b6f48388eccea4c0c9dbab9ad93d3cf77611451a
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sun Jan 18 14:48:20 2015 +0100

    utils.jsm: import AddonManager only in main proc
---
 src/content/lib/utils.jsm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/content/lib/utils.jsm b/src/content/lib/utils.jsm
index 9dd45ad..2039e55 100644
--- a/src/content/lib/utils.jsm
+++ b/src/content/lib/utils.jsm
@@ -29,7 +29,6 @@ let EXPORTED_SYMBOLS = ["Utils"];
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/AddonManager.jsm");
 //Cu.import("resource://gre/modules/devtools/Console.jsm");
 
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
@@ -39,6 +38,10 @@ ScriptLoader.importModules([
   "lib/process-environment"
 ], this);
 
+if (ProcessEnvironment.isMainProcess) {
+  Cu.import("resource://gre/modules/AddonManager.jsm");
+}
+
 
 
 
@@ -76,8 +79,9 @@ let Utils = (function() {
 
   self.info = {};
 
+  // bad smell...
   // get/set last/current RP version
-  {
+  if (ProcessEnvironment.isMainProcess) {
     self.info.lastRPVersion = rpPrefBranch.getCharPref("lastVersion");
 
     self.info.curRPVersion = "0.0";
@@ -91,8 +95,9 @@ let Utils = (function() {
     });
   }
 
+  // bad smell...
   // get/set last/current app (e.g. firefox) version
-  {
+  if (ProcessEnvironment.isMainProcess) {
     self.info.lastAppVersion = rpPrefBranch.getCharPref("lastAppVersion");
 
     let curAppVersion = Services.appinfo.version;

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