Do not show the popup if the user enabled the Observatory before installing Torbutton

pde · pde · commit 563f5ffb2c9c · 2011-09-16T13:12:03.000-07:00
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -438,9 +438,11 @@ HTTPSEverywhere.prototype = {
                         .getService(Components.interfaces.nsISupports)
                         .wrappedJSObject;
       // FIXME This prefs code is terrible spaghetti
-      var gbp = ssl_observatory.prefs.getBoolPref;
-      var shown = gbp("extensions.https_everywhere._observatory.popup_shown");
-      if (!shown && ssl_observatory.torbutton_installed) 
+      var shown = ssl_observatory.myGetBoolPref("popup_shown");
+      // this is relevant if the user just installed torbutton bad had
+      // enabled the Observatory previously
+      var enabled = ssl_observatory.myGetBoolPref("enabled");
+      if (!shown && !enabled && ssl_observatory.torbutton_installed) 
         this.chrome_opener("chrome://https-everywhere/content/observatory-popup.xul");
     }
     return;
