HTTPS E v3's semantics are to show the popup to all users

pde · pde · commit cbb007f2be1a · 2012-09-07T18:51:45.000-07:00
diff --git a/src/Changelog b/src/Changelog
@@ -5,6 +5,7 @@
     Torbutton transitioning to "always on" (we now detect a local Tor instance
     on port 9050 and use it)
     https://trac.torproject.org/projects/tor/ticket/6541
+  * Fix some other bugs in the Observatory proxy-wrangling code
   * Disable broken/buggy rulesets: Voxel, Mapquest, Imgur, Justin.tv,
     F-Secure, Valve, SpringFiles, openDesktop, syllabushare, Playboy, FAZ
   * Fixes / Improvements: Eloqua, OpenDNS, Mashable, News Corp, Sony, Yahoo!,
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -503,17 +503,15 @@ HTTPSEverywhere.prototype = {
       // again.
       var shown = ssl_observatory.myGetBoolPref("popup_shown");
       var enabled = ssl_observatory.myGetBoolPref("enabled");
-      if (!shown && !enabled) {
-        var that = this;
-        ssl_observatory.registerProxyTestNotification(function(result) {
-          if (result) {
-            that.log(INFO, "Got positivie proxy test. Displaying observatory popup.");
-            that.chrome_opener("chrome://https-everywhere/content/observatory-popup.xul");
-          } else {
-            that.log(INFO, "Got negative proxy test. Not displaying observatory popup.");
-          }
-        });
-      }
+      var that = this;
+      var obs_popup_callback = function(result) {
+        if (result) that.log(INFO, "Got positive proxy test.");
+        else        that.log(INFO, "Got negative proxy text.");
+        // We are now ready to show the popup in its most informative state
+        that.chrome_opener("chrome://https-everywhere/content/observatory-popup.xul");
+      };
+      if (!shown && !enabled)
+        ssl_observatory.registerProxyTestNotification(obs_popup_callback);
     }
     return;
   },
