From 206a4fac671fec80ec7ad6a9120542f00a25ad6f Mon Sep 17 00:00:00 2001
From: Martin Kimmerle <dev@256k.de>
Date: Thu, 21 May 2015 16:52:57 +0200
Subject: [PATCH] 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 8dd89864..21410b9a 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 eab7168e..7500e434 100644
--- 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
index c85cc60a..7fa621e5 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@requestpolicy.org</em:id>