From 612cf54bc0a8c7dd76343478950f4fd9b3917d5f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 13 Jan 2013 23:38:49 -0200 Subject: iceweasel-libre: put ddg into region.properties instead of vendor.js due that is necessary for abouthome.js in the building --- libre-testing/iceweasel-libre/libre.patch | 25 ++++++++++++++++++------- libre-testing/iceweasel-libre/vendor.js | 8 -------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/libre-testing/iceweasel-libre/libre.patch b/libre-testing/iceweasel-libre/libre.patch index 3a7884316..f80295e55 100644 --- a/libre-testing/iceweasel-libre/libre.patch +++ b/libre-testing/iceweasel-libre/libre.patch @@ -155,20 +155,31 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi } #searchText { -diff -ruN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties ---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-01-04 21:44:28.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-01-13 12:42:36.580207667 -0200 -@@ -10,18 +10,11 @@ - browser.search.order.2=Yahoo - browser.search.order.3=Bing +diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 +@@ -3,25 +3,18 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo HTML + + # 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 +- -# This is the default set of web based feed handlers shown in the reader -# selection UI -browser.contentHandlers.types.0.title=Google -browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s -browser.contentHandlers.types.1.title=My Yahoo! -browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -- ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite ++browser.search.order.3=Seeks Search + # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location diff --git a/libre-testing/iceweasel-libre/vendor.js b/libre-testing/iceweasel-libre/vendor.js index c09c3c716..865bfaec7 100644 --- a/libre-testing/iceweasel-libre/vendor.js +++ b/libre-testing/iceweasel-libre/vendor.js @@ -8,14 +8,6 @@ pref("browser.shell.checkDefaultBrowser", false); pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); -// Default search engine -pref("browser.search.defaultenginename", "DuckDuckGo HTML"); - -// Search engine order (order displayed in the search bar dropdown) -pref("browser.search.order.1", "DuckDuckGo HTML"); -pref("browser.search.order.2", "DuckDuckGo Lite"); -pref("browser.search.order.3", "Seeks Search"); - // Make sure that safebrowsing is disabled pref("browser.safebrowsing.enabled", false); pref("browser.safebrowsing.malware.enabled", false); -- cgit v1.2.3