[tor-commits] [tor-browser/tor-browser-38.1.0esr-5.0-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing

[mikeperry at torproject.org]

commit 21a3827e82201966eb1ce7ff84aefd0d503307ce
Author: Arthur Edelstein <arthuredelstein at gmail.com>
Date:   Wed Jul 8 22:28:51 2015 -0700

    fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
---
 browser/app/profile/000-tor-browser.js             |    6 ++++--
 browser/locales/en-US/searchplugins/disconnect.xml |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index 7399501..af0ffdd 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -194,13 +194,15 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"
 
 // Putting the search engine prefs into this file to fix #11236.
 // Default search engine
-pref("browser.search.defaultenginename", "Search");
+pref("browser.search.defaultenginename", "Disconnect");
+// Make sure we use the same search engine regardless of locale
+pref("browser.search.geoSpecificDefaults", false);
 
 // Search engine order (order displayed in the search bar dropdown)
 // Somewhat surprisingly we get some random behavior if we specify more than
 // two search engines as below. See
 // https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details.
-pref("browser.search.order.extra.1", "Search");
+pref("browser.search.order.extra.1", "Disconnect");
 pref("browser.search.order.extra.2", "YouTube");
 
 // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW?
diff --git a/browser/locales/en-US/searchplugins/disconnect.xml b/browser/locales/en-US/searchplugins/disconnect.xml
index cf755c2..af8d28a 100644
--- a/browser/locales/en-US/searchplugins/disconnect.xml
+++ b/browser/locales/en-US/searchplugins/disconnect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-	<ShortName>Search</ShortName>
+	<ShortName>Disconnect</ShortName>
 	<LongName>Disconnect Private Search</LongName>
 	<Description>Private searches using disconnect.me</Description>
 	<Url type="text/html" method="POST" template="https://search.disconnect.me/searchTerms/search?ses=Google&location_option=US&source=tor">