[tor-commits] [torbutton/master] Make DuckDuckGo the default Google Captcha redirect destination.

[mikeperry at torproject.org]

commit 63e6eeeea1ed61fc0e14f7abd0d8bde9778a5733
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Fri Jun 24 15:40:00 2011 -0700

    Make DuckDuckGo the default Google Captcha redirect destination.
    
    The search results seem slightly better than ixquick, and the interface is a
    lot slicker.
    
    Plus, who wouldn't trust a duck with a bow-tie? He just wants to help you so
    bad.
---
 src/chrome/content/preferences.xul      |    4 ++--
 src/defaults/preferences/preferences.js |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index b4eb3d0..1795fc1 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -359,10 +359,10 @@
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
           <hbox class="indent" align="center">
              <radiogroup align="center" orient="horizontal" id="torbutton_searchEngine">
-              <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;"
-                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
               <radio id="torbutton_engine5" label="&torbutton.prefs.engine5;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
+              <radio id="torbutton_engine1" label="&torbutton.prefs.engine1;"
+                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
               <radio id="torbutton_engine2" label="&torbutton.prefs.engine2;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
               <radio id="torbutton_engine3" label="&torbutton.prefs.engine3;"
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index 353ee32..6c874b6 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -189,7 +189,7 @@ pref("extensions.torbutton.regen_google_cookies", false);
 pref("extensions.torbutton.xfer_google_cookies", true);
 
 // Google redirect prefs
-pref("extensions.torbutton.google_redir_url", 1);
+pref("extensions.torbutton.google_redir_url", 5);
 pref("extensions.torbutton.dodge_google_captcha", true);
 pref("extensions.torbutton.asked_google_captcha", false);
 pref("extensions.torbutton.redir_url.1", "https://www.ixquick.com/do/metasearch.pl?query=");