[tor-commits] [torbutton/master] Bugs 5673+5732: Change captcha redirect to startpage.com

[mikeperry at torproject.org]

commit 0ba4efc1da05c24222b2d96eb78a6476c62ac54f
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue May 8 11:11:42 2012 -0700

    Bugs 5673+5732: Change captcha redirect to startpage.com
    
    Also remove Scroogle. RIP, Scroogle. You will be missed.
---
 src/chrome/content/preferences.xul      |    4 ++--
 src/chrome/locale/en/torbutton.dtd      |    2 +-
 src/defaults/preferences/preferences.js |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul
index d293a70..a53f54f 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -359,6 +359,8 @@
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
           <hbox class="indent" align="center">
              <radiogroup align="center" orient="horizontal" id="torbutton_searchEngine">
+              <radio id="torbutton_engine4" label="&torbutton.prefs.engine4;"
+                   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;"
@@ -367,8 +369,6 @@
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
               <radio id="torbutton_engine3" label="&torbutton.prefs.engine3;"
                    oncommand="torbutton_prefs_set_field_attributes(document)"/>
-              <radio id="torbutton_engine4" label="&torbutton.prefs.engine4;"
-                   oncommand="torbutton_prefs_set_field_attributes(document)"/>
              </radiogroup>
             </hbox>
 
diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd
index 551cd5b..01fa8f1 100644
--- a/src/chrome/locale/en/torbutton.dtd
+++ b/src/chrome/locale/en/torbutton.dtd
@@ -141,7 +141,7 @@
 <!ENTITY torbutton.prefs.engine1 "ixquick.com">
 <!ENTITY torbutton.prefs.engine2 "Bing.com">
 <!ENTITY torbutton.prefs.engine3 "Yahoo.com">
-<!ENTITY torbutton.prefs.engine4 "scroogle.org">
+<!ENTITY torbutton.prefs.engine4 "startpage.com">
 <!ENTITY torbutton.prefs.engine5 "duckduckgo.com">
 <!ENTITY torbutton.prefs.fix_google_srch "Strip platform and language off of Google Search Box queries">
 <!ENTITY torbutton.prefs.transparentTor "Transparent Torification (Requires custom transproxy or Tor router)">
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
index b78a15b..23db7c6 100644
--- a/src/defaults/preferences/preferences.js
+++ b/src/defaults/preferences/preferences.js
@@ -193,13 +193,13 @@ pref("extensions.torbutton.regen_google_cookies", false);
 pref("extensions.torbutton.xfer_google_cookies", true);
 
 // Google redirect prefs
-pref("extensions.torbutton.google_redir_url", 5);
+pref("extensions.torbutton.google_redir_url", 4);
 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=");
 pref("extensions.torbutton.redir_url.2", "http://www.bing.com/search?q=");
 pref("extensions.torbutton.redir_url.3", "http://search.yahoo.com/search?p=");
-pref("extensions.torbutton.redir_url.4", "https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi?Gw=");
+pref("extensions.torbutton.redir_url.4", "https://www.startpage.com/do/search?query=");
 pref("extensions.torbutton.redir_url.5", "https://duckduckgo.com/?q=");
 pref("extensions.torbutton.fix_google_srch", true);