[or-cvs] [torbutton/master 07/15] set tor to be enabled

[mikeperry at torproject.org]

Author: Jacob Appelbaum <jacob at appelbaum.net>
Date: Sat, 24 Jul 2010 01:33:26 +0200
Subject: set tor to be enabled
Commit: ae7a3c36e4881d1bc695b685e35b15d73b0370fd

---
 src/chrome/content/preferences.js |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index d19cf56..903b072 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -402,6 +402,25 @@ function torbutton_prefs_save(doc) {
     o_torprefs.setCharPref('no_proxies_on',      doc.getElementById('torbutton_noProxiesOn').value);
 
     o_torprefs.setBoolPref('torbutton_transparentTor', doc.getElementById('torbutton_transparentTor').selected);
+    if (o_torprefs.getBoolPref('torbutton_transparentTor')) {
+        var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+            .getService(Components.interfaces.nsIWindowMediator);
+        var chrome = wm.getMostRecentWindow("navigator:browser");
+        var ret = chrome.torbutton_test_settings();
+        if (ret != 4) {
+            var warning = strings.GetStringFromName("torbutton.popup.test.failure");
+            window.alert(warning);
+        }
+
+        else {
+            o_torprefs.setBoolPref('torbutton_tor_enabled', true);
+            // In theory this is where we unlock some things that are now "safe"
+            // Unleash Flash on Tor users
+            // Ignore any proxy settings that the user has set
+            // etc etc etc - pde will be very happy
+        }
+    }
+
 
     if (doc.getElementById('torbutton_settingsMethod').value == 'custom') {
         // XXX: Is this even needed anymore? We don't read the
-- 
1.7.1