From 96f641e2908cd874ed636efc7c4a5d820075a6d6 Mon Sep 17 00:00:00 2001 From: "ben%bengoodger.com" Date: Sun, 29 Aug 2004 11:20:46 +0000 Subject: [PATCH] followup to 255394 - non-default search query parameter generation - fix crash in seamonkey by adding a null check, and make sure we locate general.useragent.locale in the right .properties file. --- xpfe/components/search/src/nsInternetSearchService.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xpfe/components/search/src/nsInternetSearchService.cpp b/xpfe/components/search/src/nsInternetSearchService.cpp index cbbad69ee4f0..fe7ac17e87f4 100755 --- a/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/xpfe/components/search/src/nsInternetSearchService.cpp @@ -105,10 +105,11 @@ #define SEARCH_PROPERTIES "chrome://communicator/locale/search/search-panel.properties" #ifdef MOZ_PHOENIX #define SEARCHCONFIG_PROPERTIES "chrome://browser/content/searchconfig.properties" +#define INTL_PROPERTIES "chrome://global/locale/intl.properties" #else #define SEARCHCONFIG_PROPERTIES "chrome://navigator/content/searchconfig.properties" +#define INTL_PROPERTIES "chrome://navigator/locale/navigator.properties" #endif -#define INTL_PROPERTIES "chrome://global/locale/intl.properties" static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID); @@ -4730,7 +4731,8 @@ InternetSearchDataSource::GetInputs(const PRUnichar *dataUni, nsString &engineNa rv = rootBranch->GetComplexValue("browser.search.selectedEngine", NS_GET_IID(nsIPrefLocalizedString), getter_AddRefs(selectedEngineName)); - selectedEngineName->GetData(getter_Copies(selectedEngineNameStr)); + if (selectedEngineName) + selectedEngineName->GetData(getter_Copies(selectedEngineNameStr)); engineIsNotDefault = !defaultEngineNameStr.Equals(selectedEngineNameStr); }