Commit 0ba4efc1 authored by Mike Perry's avatar Mike Perry
Browse files

Bugs 5673+5732: Change captcha redirect to startpage.com

Also remove Scroogle. RIP, Scroogle. You will be missed.
parent 926fb864
......@@ -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>
......
......@@ -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)">
......@@ -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);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment