[or-cvs] [torbutton/master 06/15] hook actual user requests into a meaningful selection

[mikeperry@xxxxxxxxxxxxxx]

Author: Jacob Appelbaum <jacob@xxxxxxxxxxxxx>
Date: Sat, 24 Jul 2010 01:18:59 +0200
Subject: hook actual user requests into a meaningful selection
Commit: 7c51488aa7ceab47230897b7135a53c8ec4271d6

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

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index 0e95e81..d19cf56 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -144,6 +144,9 @@ function torbutton_prefs_init(doc) {
     }
     doc.getElementById('torbutton_noProxiesOn').value = o_torprefs.getCharPref('no_proxies_on');
 
+    // Transparent Torification magic
+    doc.getElementById('torbutton_transparentTor').selected = o_torprefs.getBoolPref('torbutton_transparentTor');
+
     // doc.getElementById('torbutton_warnUponExcludedSite').checked = o_torprefs.getBoolPref('prompt_before_visiting_excluded_sites');
 
     doc.getElementById('torbutton_disablePlugins').checked = o_torprefs.getBoolPref('no_tor_plugins');
@@ -397,7 +400,9 @@ 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 (doc.getElementById('torbutton_settingsMethod').value == 'custom') {
         // XXX: Is this even needed anymore? We don't read the
         // custom prefs at all it seems..
-- 
1.7.1