[or-cvs] [torbutton/master 16/30] 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: 2f0af4649a09208d81f82460b71c526cfa8cd432

---
 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 54d329c..9996ecc 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -281,6 +281,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')) {
@@ -496,6 +497,7 @@ function torbutton_prefs_save(doc) {
     if (doc.getElementById('torbutton_CustomReferer').selected)
        o_torprefs.setCharPref('customref',doc.getElementById('torbutton_CustomRef').value);
 
+    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 112a269..381ce2b 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -338,7 +338,7 @@
           <checkbox id="torbutton_jarCACerts" label="&torbutton.prefs.jar_ca_certs;" 
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
 
-          <checkbox id="torbutton_no  er" label="&torbutton.prefs.disable_referer;" 
+          <checkbox id="torbutton_noReferer" label="&torbutton.prefs.disable_referer;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
 -->
             <checkbox id="torbutton_spoofRefresh" label="&torbutton.prefs.spoofreresh;" oncommand="torbutton_prefs_set_field_attributes(document)" />
@@ -350,6 +350,8 @@
               <radio id="torbutton_CustomReferer" label="Custom Referer" />
             </radiogroup>
            <textbox id="torbutton_CustomRef" value="" disabled="!document.getElementById('torbutton_CustomReferer').selected"/>
+          <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;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 21b0168..3f0b52e 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -129,3 +129,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.6.5