Skip to content

Commit 6d0048c

Browse files
committed
3.0 will offer an Observatory opt-in to all users
With https://trac.torproject.org/projects/tor/ticket/5154 fixed by FF10, the potential for havoc should be a bit lower.
1 parent 46a19ad commit 6d0048c

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

src/components/https-everywhere.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -495,12 +495,12 @@ HTTPSEverywhere.prototype = {
495495
var ssl_observatory = CC["@eff.org/ssl-observatory;1"]
496496
.getService(Components.interfaces.nsISupports)
497497
.wrappedJSObject;
498-
// FIXME This prefs code is terrible spaghetti
498+
// Show the popup at most once. Users who enabled the Observatory before
499+
// a version that would have shown it to them, don't need to see it
500+
// again.
499501
var shown = ssl_observatory.myGetBoolPref("popup_shown");
500-
// this is relevant if the user just installed torbutton bad had
501-
// enabled the Observatory previously
502502
var enabled = ssl_observatory.myGetBoolPref("enabled");
503-
if (!shown && !enabled && ssl_observatory.torbutton_installed)
503+
if (!shown && !enabled)
504504
this.chrome_opener("chrome://https-everywhere/content/observatory-popup.xul");
505505
}
506506
return;

0 commit comments

Comments
 (0)