[tor-commits] [tor-browser/tor-browser-31.4.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.

[mikeperry at torproject.org]

commit 9a5a1cec6b3449c1f5f3706823ec5b1ff31e40d0
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Feb 18 14:21:49 2015 +0000

    fixup! TB4: Tor Browser's Firefox preference overrides.
    
    It turns out that the fix for #11236 still contains too much
    randomnees for our taste if more than two search engines are specified
    to be on the top. Fall back to just two.
---
 browser/app/profile/000-tor-browser.js |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js
index cb59517..ceb9394 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -153,11 +153,11 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"
 pref("browser.search.defaultenginename", "Search");
 
 // Search engine order (order displayed in the search bar dropdown)
-// Somewhat surprisingly we get Disconnect - YouTube - Twitter as the order
-// only if we set them as below.
-pref("browser.search.order.extra.1", "YouTube");
-pref("browser.search.order.extra.2", "Twitter");
-pref("browser.search.order.extra.3", "Search");
+// 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.2", "YouTube");
 
 // Hacks/workarounds: Direct2D seems to crash w/ lots of video cards w/ MinGW?
 // Nvida cards also experience crashes without the second pref set to disabled