[Pkg-mozext-commits] [requestpolicy] 36/280: bugfix

[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 498df2be5a13d8377364f282e060a3aa7a09252b
Author: Martin Kimmerle <dev at 256k.de>
Date:   Wed Nov 26 01:10:25 2014 +0100

    bugfix
---
 src/content/lib/policy-manager.jsm    | 6 +++---
 src/content/settings/common.js        | 4 ++--
 src/content/settings/setup.js         | 4 ++--
 src/content/settings/subscriptions.js | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/content/lib/policy-manager.jsm b/src/content/lib/policy-manager.jsm
index 5cfcf52..737f34b 100644
--- a/src/content/lib/policy-manager.jsm
+++ b/src/content/lib/policy-manager.jsm
@@ -29,6 +29,8 @@ let EXPORTED_SYMBOLS = ["PolicyManager", "RULES_CHANGED_TOPIC"];
 
 const RULES_CHANGED_TOPIC = "requestpolicy-rules-changed";
 
+Cu.import("resource://gre/modules/Services.jsm");
+
 Cu.import("chrome://requestpolicy/content/lib/script-loader.jsm");
 ScriptLoader.importModules([
   "logger",
@@ -52,9 +54,7 @@ function warn(msg) {
 }
 
 function notifyRulesChanged() {
-  var observerService = Components.classes["@mozilla.org/observer-service;1"].
-      getService(Components.interfaces.nsIObserverService);
-  observerService.notifyObservers(null, RULES_CHANGED_TOPIC, null);
+  Services.obs.notifyObservers(null, RULES_CHANGED_TOPIC, null);
 }
 
 
diff --git a/src/content/settings/common.js b/src/content/settings/common.js
index 0815c9f..f8f2ea7 100644
--- a/src/content/settings/common.js
+++ b/src/content/settings/common.js
@@ -60,7 +60,7 @@ common.switchSubscriptionPolicies = function () {
       var subInfo = {};
       subInfo[listName] = {};
       subInfo[listName][subName] = true;
-      observerService.notifyObservers(null, SUBSCRIPTION_REMOVED_TOPIC,
+      Services.obs.notifyObservers(null, SUBSCRIPTION_REMOVED_TOPIC,
           JSON.stringify(subInfo));
     }
   }
@@ -74,7 +74,7 @@ common.switchSubscriptionPolicies = function () {
       var subInfo = {};
       subInfo[listName] = {};
       subInfo[listName][subName] = true;
-      observerService.notifyObservers(null, SUBSCRIPTION_ADDED_TOPIC,
+      Services.obs.notifyObservers(null, SUBSCRIPTION_ADDED_TOPIC,
           JSON.stringify(subInfo));
     }
   }
diff --git a/src/content/settings/setup.js b/src/content/settings/setup.js
index abeb2b8..a68c5db 100644
--- a/src/content/settings/setup.js
+++ b/src/content/settings/setup.js
@@ -69,11 +69,11 @@ function handleSubscriptionsChange() {
     if (enableAllowSubs && subName.indexOf('allow_') == 0 ||
         enableDenySubs && subName.indexOf('deny_') == 0) {
       userSubs.addSubscription('official', subName);
-      observerService.notifyObservers(null, SUBSCRIPTION_ADDED_TOPIC,
+      Services.obs.notifyObservers(null, SUBSCRIPTION_ADDED_TOPIC,
           JSON.stringify(subInfo));
     } else {
       userSubs.removeSubscription('official', subName);
-      observerService.notifyObservers(null, SUBSCRIPTION_REMOVED_TOPIC,
+      Services.obs.notifyObservers(null, SUBSCRIPTION_REMOVED_TOPIC,
           JSON.stringify(subInfo));
     }
   }
diff --git a/src/content/settings/subscriptions.js b/src/content/settings/subscriptions.js
index f7eb010..f44e4ac 100644
--- a/src/content/settings/subscriptions.js
+++ b/src/content/settings/subscriptions.js
@@ -97,11 +97,11 @@ function handleSubscriptionCheckboxChange(event) {
   subInfo['official'][subName] = true;
   if (enabled) {
     userSubs.addSubscription('official', subName);
-    observerService.notifyObservers(null, SUBSCRIPTION_ADDED_TOPIC,
+    Services.obs.notifyObservers(null, SUBSCRIPTION_ADDED_TOPIC,
           JSON.stringify(subInfo));
   } else {
     userSubs.removeSubscription('official', subName);
-    observerService.notifyObservers(null, SUBSCRIPTION_REMOVED_TOPIC,
+    Services.obs.notifyObservers(null, SUBSCRIPTION_REMOVED_TOPIC,
           JSON.stringify(subInfo));
   }
 }

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