Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

263928 - distribution id for search results r=vlad sr=brendan

Browse Source
This commit is contained in:
ben%bengoodger.com 2004-10-11 23:08:04 +00:00
parent 5be4b0f4b4
commit f27e742f65
5 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/base/content/searchconfig.properties
View File

@ -1,7 +1,7 @@
# Do NOT localize or otherwise change these values
browser.search.param.Google.1.custom=client=firefox
browser.search.param.Google.1.default=client=firefox
browser.search.param.Google.release=rls=org.mozilla:%S:unofficial
browser.search.param.Google.release=rls=%S:%S:unofficial
browser.search.order.Yahoo.1=client=firefox-1-unofficial
browser.search.order.Yahoo.2=client=firefox-2-unofficial

11
configure.in
View File

@ -3468,6 +3468,17 @@ MOZ_ARG_ENABLE_BOOL(official-branding,
AC_SUBST(MOZ_USE_OFFICIAL_BRANDING)
dnl ========================================================
dnl = Distribution ID
dnl ========================================================
MOZ_ARG_WITH_STRING(distribution-id,
[ --with-distribution-id=ID Set distribution-specific id (default=org.mozilla)],
[ val=`echo $withval`
MOZ_DISTRIBUTION_ID="$val"])
AC_DEFINE_UNQUOTED(MOZ_DISTRIBUTION_ID,"$MOZ_DISTRIBUTION_ID")
AC_SUBST(MOZ_DISTRIBUTION_ID)
dnl ========================================================
dnl = Phoenix
dnl ========================================================

2
other-licenses/branding/firefox/content/searchconfig.properties
View File

@ -1,7 +1,7 @@
# Do NOT localize or otherwise change these values
browser.search.param.Google.1.custom=client=firefox
browser.search.param.Google.1.default=client=firefox-a
browser.search.param.Google.release=rls=org.mozilla:%S:official
browser.search.param.Google.release=rls=%S:%S:official
browser.search.order.Yahoo.1=client=firefox-1-official
browser.search.order.Yahoo.2=client=firefox-2-official

2
xpfe/browser/resources/content/searchconfig.properties
View File

@ -1,5 +1,5 @@
# Do NOT localize or otherwise change these values
browser.search.param.Google.1.custom=client=mozilla
browser.search.param.Google.1.default=client=mozilla
browser.search.param.Google.release=rls=org.mozilla:%S:unofficial
browser.search.param.Google.release=rls=%S:%S:unofficial

9
xpfe/components/search/src/nsInternetSearchService.cpp
View File

@ -112,6 +112,10 @@
#define INTL_PROPERTIES "chrome://navigator/locale/navigator.properties"
#endif
#ifndef MOZ_DISTRIBUTION_ID
#define MOZ_DISTRIBUTION_ID "org.mozilla"
#endif
static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID);
@ -4884,8 +4888,9 @@ InternetSearchDataSource::GetInputs(const PRUnichar *dataUni, nsString &engineNa
keyTemplate.Append(NS_LITERAL_STRING(".release"));
nsXPIDLString releaseValue;
const PRUnichar* strings[] = { langName.get() };
bundle->FormatStringFromName(keyTemplate.get(), strings, 1, getter_Copies(releaseValue));
const PRUnichar* strings[] = { NS_LITERAL_STRING(MOZ_DISTRIBUTION_ID).get(),
langName.get() };
bundle->FormatStringFromName(keyTemplate.get(), strings, 2, getter_Copies(releaseValue));
if (!releaseValue.IsEmpty())
{