[Pkg-mozext-commits] [requestpolicy] 12/14: Don't show "Important Notice" when RP is *disabled*

David Prévot taffit at moszumanska.debian.org
Sun Jul 5 15:42:38 UTC 2015


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

taffit pushed a commit to annotated tag v0.5.29
in repository requestpolicy.

commit 206a4fac671fec80ec7ad6a9120542f00a25ad6f
Author: Martin Kimmerle <dev at 256k.de>
Date:   Thu May 21 16:52:57 2015 +0200

    Don't show "Important Notice" when RP is *disabled*
---
 src/components/requestpolicyService.js | 5 +++++
 src/content/rp-and-rpc.html            | 4 ++--
 src/install.rdf                        | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/requestpolicyService.js b/src/components/requestpolicyService.js
index 8dd8986..21410b9 100644
--- a/src/components/requestpolicyService.js
+++ b/src/components/requestpolicyService.js
@@ -188,6 +188,11 @@ RequestPolicyService.prototype = {
         return;
       }
 
+      if (addon.isActive === false) {
+        // RP is disabled
+        return;
+      }
+
       const url = "chrome://rpcontinued/content/rp-and-rpc.html";
 
       var wm = CC["@mozilla.org/appshell/window-mediator;1"]
diff --git a/src/content/rp-and-rpc.html b/src/content/rp-and-rpc.html
index eab7168..7500e43 100644
--- a/src/content/rp-and-rpc.html
+++ b/src/content/rp-and-rpc.html
@@ -38,8 +38,8 @@
 
       <p>
         However, currently both <i>“RequestPolicy”</i> and
-        <i>“RequestPolicy Continued”</i> are installed in your browser.
-        <b>This will lead to conflicts!</b>
+        <i>“RequestPolicy Continued”</i> are installed and enabled
+        in your browser. <b>This will lead to conflicts!</b>
       </p>
 
       <p>
diff --git a/src/install.rdf b/src/install.rdf
index c85cc60..7fa621e 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -5,7 +5,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:name>RequestPolicy Continued</em:name>
-    <em:version>0.5.29b3</em:version>
+    <em:version>0.5.29b4</em:version>
     <em:type>2</em:type>
     <em:description>Control which cross-site requests are allowed. Improve the privacy of your browsing. Secure yourself from Cross-Site Request Forgery (CSRF) and other attacks.</em:description>
     <em:id>rpcontinued at requestpolicy.org</em:id>

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



More information about the Pkg-mozext-commits mailing list