From bbb34d68b1ebfb25e0ab4be4bfadeb03fbcd6bc8 Mon Sep 17 00:00:00 2001 From: "benjamin%smedbergs.us" Date: Tue, 12 Sep 2006 14:08:31 +0000 Subject: [PATCH] Bug 351865 - zh-CN searchplugin parameters are unusual, r=pike --- browser/app/firefox-branding.js | 5 +++++ browser/app/profile/firefox.js | 3 --- other-licenses/branding/firefox/pref/firefox-branding.js | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/browser/app/firefox-branding.js b/browser/app/firefox-branding.js index 972eec43772..21e20eb3dea 100644 --- a/browser/app/firefox-branding.js +++ b/browser/app/firefox-branding.js @@ -9,3 +9,8 @@ pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); // Release notes URL pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); + +// Search codes belong only in builds with official branding +pref("browser.search.param.yahoo-fr", ""); +pref("browser.search.param.yahoo-fr-cjkt", ""); +pref("browser.search.param.yahoo-f-CN", ""); diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index d70fd41e3a6..f84b7ca0abd 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -223,9 +223,6 @@ pref("browser.search.order.Yahoo.1", "chrome://branding/content/searchc pref("browser.search.order.Yahoo.2", "chrome://branding/content/searchconfig.properties"); pref("browser.search.order.Yahoo", "chrome://branding/content/searchconfig.properties"); -pref("browser.search.param.yahoo-fr", "moz2"); -pref("browser.search.param.yahoo-fr-cjkt", "fx2-moz-1"); - // search bar results always open in a new tab pref("browser.search.openintab", false); diff --git a/other-licenses/branding/firefox/pref/firefox-branding.js b/other-licenses/branding/firefox/pref/firefox-branding.js index 08c6043725e..5a7662da406 100644 --- a/other-licenses/branding/firefox/pref/firefox-branding.js +++ b/other-licenses/branding/firefox/pref/firefox-branding.js @@ -9,3 +9,7 @@ pref("app.update.url.details", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/r // Release notes URL pref("app.releaseNotesURL", "http://%LOCALE%.www.mozilla.com/%LOCALE%/%APP%/%VERSION%/releasenotes/"); + +pref("browser.search.param.yahoo-fr", "moz2"); +pref("browser.search.param.yahoo-fr-cjkt", "fx2-moz-1"); +pref("browser.search.param.yahoo-f-CN", "D3_g");