[Pkg-mozext-commits] [requestpolicy] 119/280: fix some issues

[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 44db0f02a3e20244c38f9248375e4cc249023ad0
Author: Martin Kimmerle <dev at 256k.de>
Date:   Tue Jan 6 14:50:45 2015 +0100

    fix some issues
---
 src/content/lib/request-processor.jsm          | 3 +--
 src/content/lib/request-processor.redirects.js | 3 ---
 src/content/settings/subscriptions.js          | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/content/lib/request-processor.jsm b/src/content/lib/request-processor.jsm
index 643da9e..97aae85 100644
--- a/src/content/lib/request-processor.jsm
+++ b/src/content/lib/request-processor.jsm
@@ -51,8 +51,7 @@ ScriptLoader.importModules([
   "lib/process-environment"
 ], this);
 ScriptLoader.defineLazyModuleGetters({
-  "lib/content-policy": ["PolicyImplementation"],
-  "main/requestpolicy-service": ["rpService"]
+  "lib/content-policy": ["PolicyImplementation"]
 }, this);
 
 
diff --git a/src/content/lib/request-processor.redirects.js b/src/content/lib/request-processor.redirects.js
index 75c579b..0163fff 100644
--- a/src/content/lib/request-processor.redirects.js
+++ b/src/content/lib/request-processor.redirects.js
@@ -38,9 +38,6 @@ ScriptLoader.importModules([
   "lib/http-response",
   "lib/process-environment"
 ], this);
-ScriptLoader.defineLazyModuleGetters({
-  "main/requestpolicy-service": ["rpService"]
-}, this);
 
 
 
diff --git a/src/content/settings/subscriptions.js b/src/content/settings/subscriptions.js
index ae6cbc5..2a7cefb 100644
--- a/src/content/settings/subscriptions.js
+++ b/src/content/settings/subscriptions.js
@@ -76,7 +76,7 @@ function updateDisplay() {
     element.input.checked = (element.id in subsInfo['official']);
   }
 
-  if (rpService._defaultAllow) {
+  if (Prefs.isDefaultAllow) {
     var currentPolicy = 'allow', otherPolicy = 'deny';
   } else {
     var currentPolicy = 'deny', otherPolicy = 'allow';

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