[or-cvs] [torbutton/master 20/47] Add pref UI for google search box fix.

[mikeperry at torproject.org]

Author: Mike Perry <mikeperry-git at fscked.org>
Date: Wed, 31 Mar 2010 02:52:02 -0700
Subject: Add pref UI for google search box fix.
Commit: 5b80348b27245c2666f5c3e2754f18cba963bf64

---
 src/chrome/content/preferences.js  |    2 ++
 src/chrome/content/preferences.xul |    4 +++-
 src/chrome/locale/en/torbutton.dtd |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js
index c8a0a65..a0501bb 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -270,6 +270,7 @@ function torbutton_prefs_init(doc) {
     doc.getElementById('torbutton_blockTorFileNet').checked = o_torprefs.getBoolPref('block_tor_file_net');
     doc.getElementById('torbutton_blockNonTorFileNet').checked = o_torprefs.getBoolPref('block_nontor_file_net');
 
+    doc.getElementById('torbutton_fixGoogleSrch').checked = o_torprefs.getBoolPref('fix_google_srch');
     doc.getElementById('torbutton_lockedMode').checked = o_torprefs.getBoolPref('locked_mode');
 
     switch(o_torprefs.getIntPref('google_redir_url')) {
@@ -468,6 +469,7 @@ function torbutton_prefs_save(doc) {
     o_torprefs.setBoolPref('spoof_english', doc.getElementById('torbutton_spoofEnglish').checked);
 
     o_torprefs.setBoolPref('locked_mode', doc.getElementById('torbutton_lockedMode').checked);
+    o_torprefs.setBoolPref('fix_google_srch', doc.getElementById('torbutton_fixGoogleSrch').checked);
     o_torprefs.setBoolPref('dodge_google_captcha', doc.getElementById('torbutton_noCaptcha').checked);
 
     if(doc.getElementById('torbutton_searchEngine').selectedItem ==
diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index ff1605a..5c8265d 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -336,7 +336,9 @@
           <checkbox id="torbutton_jarCACerts" label="&torbutton.prefs.jar_ca_certs;" 
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
 -->
-          <checkbox id="torbutton_noReferer" label="&torbutton.prefs.disable_referer;" 
+          <checkbox id="torbutton_noReferer" label="&torbutton.prefs.disable_referer;"
+                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
+          <checkbox id="torbutton_fixGoogleSrch" label="&torbutton.prefs.fix_google_srch;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
           <spacer/>
           <checkbox id="torbutton_noCaptcha" label="&torbutton.prefs.dodge_google_captcha;"
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 230cace..20d547a 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -103,3 +103,4 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "scroogle.org">
+<!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
-- 
1.7.1