commit 82e963c4dd00d49ac6eeacf8e0d171cad7317b6b Author: Mike Perry <mikeperry-git@fscked.org> Date: Sat Feb 9 12:50:49 2013 -0800 Reset default search engine to startpage. The prefs have become localized properties.. This may or may not survive on non en_US builds? --- build-scripts/config/pound_tor.js | 4 --- .../0014-Add-DDG-and-StartPage-to-Omnibox.patch | 26 ++++++++++++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/build-scripts/config/pound_tor.js b/build-scripts/config/pound_tor.js index c509a37..28390be 100644 --- a/build-scripts/config/pound_tor.js +++ b/build-scripts/config/pound_tor.js @@ -109,8 +109,4 @@ pref("xpinstall.whitelist.add", ""); pref("xpinstall.whitelist.add.36", ""); // Omnibox settings -pref("browser.search.order.1", "Startpage"); -pref("browser.search.order.2", "DuckDuckGo"); -pref("browser.search.order.3", "Google"); -pref("browser.search.selectedEngine", "Startpage"); pref("keyword.URL", "https://startpage.com/do/search?q="); diff --git a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch index c50adff..caa96f6 100644 --- a/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch +++ b/src/current-patches/firefox/0014-Add-DDG-and-StartPage-to-Omnibox.patch @@ -1,4 +1,4 @@ -From 8b96f6a7116c524ae946736c98c2e2fa75460609 Mon Sep 17 00:00:00 2001 +From ab1a01ca37e8ca848c2629d8b1d0768094d3a1ea Mon Sep 17 00:00:00 2001 From: Mike Perry <mikeperry-git@torproject.org> Date: Wed, 25 Apr 2012 15:03:46 -0700 Subject: [PATCH 14/26] Add DDG and StartPage to Omnibox. @@ -6,13 +6,35 @@ Subject: [PATCH 14/26] Add DDG and StartPage to Omnibox. You mean there are search engines that don't require captchas if you don't have a cookie? Holy crap. Get those in there now. --- + .../en-US/chrome/browser-region/region.properties | 8 +++--- browser/locales/en-US/searchplugins/duckduckgo.xml | 29 ++++++++++++++++++++ browser/locales/en-US/searchplugins/list.txt | 2 + browser/locales/en-US/searchplugins/startpage.xml | 11 +++++++ - 3 files changed, 42 insertions(+), 0 deletions(-) + 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 browser/locales/en-US/searchplugins/duckduckgo.xml create mode 100644 browser/locales/en-US/searchplugins/startpage.xml +diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +index c3a980c..9c21f04 100644 +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties +@@ -3,12 +3,12 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Startpage + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo +-browser.search.order.3=Bing ++browser.search.order.1=Startpage ++browser.search.order.2=DuckDuckGo ++browser.search.order.3=Google + + # This is the default set of web based feed handlers shown in the reader + # selection UI diff --git a/browser/locales/en-US/searchplugins/duckduckgo.xml b/browser/locales/en-US/searchplugins/duckduckgo.xml new file mode 100644 index 0000000..4f00b4d