Don't show "Important Notice" when RP is *disabled*

RequestPolicyContinued · May 21, 2015 · 206a4fa · 206a4fa
1 parent 4f98957
commit 206a4fa
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -38,8 +38,8 @@ <h1>Important Notice! <span>regarding RequestPolicy</span></h1>
 
       <p>
         However, currently both <i>&ldquo;RequestPolicy&rdquo;</i> and
-        <i>&ldquo;RequestPolicy Continued&rdquo;</i> are installed in your browser.
-        <b>This will lead to conflicts!</b>
+        <i>&ldquo;RequestPolicy Continued&rdquo;</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
@@ -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>[email protected]</em:id>