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

Backing out valeski

Browse Source
This commit is contained in:
sfraser%netscape.com 2001-04-27 05:53:22 +00:00
parent e218812400
commit 245d4eb76f
48 changed files with 248 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
caps/src/nsScriptSecurityManager.cpp
View File

@ -1159,8 +1159,9 @@ Localize(char *genericString, nsString &result)
nsCRT::free(spec);
return ret;
}
nsILocale *locale = nsnull;
nsIStringBundle *bundle = nsnull;
ret = pStringService->CreateBundle(spec, &bundle);
ret = pStringService->CreateBundle(spec, locale, &bundle);
nsCRT::free(spec);
nsServiceManager::ReleaseService(kStringBundleServiceCID, pStringService);
if (NS_FAILED(ret)) {

3
content/html/document/src/nsImageDocument.cpp
View File

@ -468,7 +468,8 @@ nsresult nsImageDocument::UpdateTitle( void )
// Create a bundle for the localization
NS_WITH_SERVICE(nsIStringBundleService, stringService, kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv) && stringService) {
rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, getter_AddRefs(bundle));
nsCOMPtr<nsILocale> locale = nsnull;
rv = stringService->CreateBundle(NSIMAGEDOCUMENT_PROPERTIES_URI, locale, getter_AddRefs(bundle));
}
if (NS_SUCCEEDED(rv) && bundle) {
nsAutoString key;

97
docshell/base/nsDocShell.cpp
View File

@ -55,6 +55,7 @@
#include "nsDocShell.h"
#include "nsDocShellLoadInfo.h"
#include "nsCDefaultURIFixup.h"
#include "nsDocShellEnumerator.h"
// Helper Classes
#include "nsDOMError.h"
@ -67,6 +68,7 @@
#include "nsIProgressEventSink.h"
#include "nsIWebProgress.h"
#include "nsILayoutHistoryState.h"
#include "nsILocaleService.h"
#include "nsITimer.h"
#include "nsIFileStream.h"
#include "nsISHistoryInternal.h"
@ -293,6 +295,15 @@ NS_IMETHODIMP nsDocShell::GetInterface(const nsIID& aIID, void** aSink)
}
return NS_NOINTERFACE;
}
else if (aIID.Equals(NS_GET_IID(nsIWebBrowserFind)))
{
nsresult rv = EnsureFind();
if (NS_FAILED(rv)) return rv;
*aSink = mFind;
NS_ADDREF((nsISupports*)*aSink);
return NS_OK;
}
else
{
return QueryInterface(aIID, aSink);
@ -774,6 +785,35 @@ nsDocShell::SetAllowSubframes(PRBool aAllowSubframes)
return NS_OK;
}
NS_IMETHODIMP
nsDocShell::GetDocShellEnumerator(PRInt32 aItemType, PRInt32 aDirection, nsISimpleEnumerator **outEnum)
{
NS_ENSURE_ARG_POINTER(outEnum);
*outEnum = nsnull;
nsDocShellEnumerator* docShellEnum;
if (aDirection == ENUMERATE_FORWARDS)
docShellEnum = new nsDocShellForwardsEnumerator;
else
docShellEnum = new nsDocShellBackwardsEnumerator;
if (!docShellEnum) return NS_ERROR_OUT_OF_MEMORY;
nsresult rv = docShellEnum->SetEnumDocShellType(aItemType);
if (NS_FAILED(rv)) return rv;
rv = docShellEnum->SetEnumerationRootItem((nsIDocShellTreeItem *)this);
if (NS_FAILED(rv)) return rv;
rv = docShellEnum->First();
if (NS_FAILED(rv)) return rv;
docShellEnum->AddRef(); // ensure we don't lose the last ref inside the QueryInterface
rv = docShellEnum->QueryInterface(NS_GET_IID(nsISimpleEnumerator), (void **)outEnum);
docShellEnum->Release();
return rv;
}
NS_IMETHODIMP nsDocShell::GetAppType(PRUint32* aAppType)
{
*aAppType = mAppType;
@ -4288,6 +4328,7 @@ NS_IMETHODIMP nsDocShell::LoadHistoryEntry(nsISHEntry* aEntry, PRUint32 aLoadTyp
NS_ENSURE_SUCCESS(hEntry->GetURI(getter_AddRefs(uri)), NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(aEntry->GetReferrerURI(getter_AddRefs(referrerURI)), NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(aEntry->GetPostData(getter_AddRefs(postData)), NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(InternalLoad(uri, referrerURI, nsnull, PR_TRUE, PR_FALSE, nsnull,
postData, nsnull, aLoadType, aEntry),
NS_ERROR_FAILURE);
@ -4519,10 +4560,17 @@ NS_IMETHODIMP nsDocShell::GetPromptAndStringBundle(nsIPrompt** aPrompt,
{
NS_ENSURE_SUCCESS(GetInterface(NS_GET_IID(nsIPrompt), (void**)aPrompt), NS_ERROR_FAILURE);
nsCOMPtr<nsILocaleService> localeService(do_GetService(NS_LOCALESERVICE_CONTRACTID));
NS_ENSURE_TRUE(localeService, NS_ERROR_FAILURE);
nsCOMPtr<nsILocale> locale;
localeService->GetSystemLocale(getter_AddRefs(locale));
NS_ENSURE_TRUE(locale, NS_ERROR_FAILURE);
nsCOMPtr<nsIStringBundleService> stringBundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID));
NS_ENSURE_TRUE(stringBundleService, NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(stringBundleService->CreateBundle(DIALOG_STRING_URI,
NS_ENSURE_SUCCESS(stringBundleService->CreateBundle(DIALOG_STRING_URI, locale,
getter_AddRefs(aStringBundle)), NS_ERROR_FAILURE);
return NS_OK;
@ -4615,6 +4663,53 @@ NS_IMETHODIMP nsDocShell::EnsureScriptEnvironment()
return NS_OK;
}
NS_IMETHODIMP nsDocShell::EnsureFind()
{
nsresult rv;
if (!mFind)
{
mFind = do_CreateInstance("@mozilla.org/embedcomp/find;1", &rv);
if (NS_FAILED(rv)) return rv;
}
// we promise that the nsIWebBrowserFind that we return has been set
// up to point to the focussed, or content window, so we have to
// set that up each time.
nsCOMPtr<nsIScriptGlobalObject> scriptGO;
rv = GetScriptGlobalObject(getter_AddRefs(scriptGO));
if (NS_FAILED(rv)) return rv;
// default to our window
nsCOMPtr<nsIDOMWindow> rootWindow = do_QueryInterface(scriptGO);
nsCOMPtr<nsIDOMWindow> windowToSearch = rootWindow;
// if we can, search the focussed window
nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(scriptGO);
nsCOMPtr<nsIFocusController> focusController;
if (ourWindow)
ourWindow->GetRootFocusController(getter_AddRefs(focusController));
if (focusController)
{
nsCOMPtr<nsIDOMWindowInternal> focussedWindow;
focusController->GetFocusedWindow(getter_AddRefs(focussedWindow));
if (focussedWindow)
{
rootWindow = focussedWindow; // constrain to the focussed window.
windowToSearch = focussedWindow;
}
}
nsCOMPtr<nsIWebBrowserFindInFrames> findInFrames = do_QueryInterface(mFind);
if (!findInFrames) return NS_ERROR_NO_INTERFACE;
rv = findInFrames->SetRootSearchFrame(rootWindow);
if (NS_FAILED(rv)) return rv;
rv = findInFrames->SetCurrentSearchFrame(windowToSearch);
if (NS_FAILED(rv)) return rv;
return NS_OK;
}
PRBool nsDocShell::IsFrame()
{
if(mParent)

3
editor/base/nsEditorShell.cpp
View File

@ -296,7 +296,8 @@ nsEditorShell::Init()
NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n");
return res;
}
res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, getter_AddRefs(mStringBundle));
nsILocale* aLocale = nsnull;
res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, aLocale, getter_AddRefs(mStringBundle));
// XXX: why are we returning NS_OK here rather than res?
// is it ok to fail to get a string bundle? if so, it should be documented.

3
editor/composer/src/nsEditorShell.cpp
View File

@ -296,7 +296,8 @@ nsEditorShell::Init()
NS_WARNING("ERROR: Failed to get StringBundle Service instance.\n");
return res;
}
res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, getter_AddRefs(mStringBundle));
nsILocale* aLocale = nsnull;
res = stringBundleService->CreateBundle(EDITOR_BUNDLE_URL, aLocale, getter_AddRefs(mStringBundle));
// XXX: why are we returning NS_OK here rather than res?
// is it ok to fail to get a string bundle? if so, it should be documented.

3
embedding/base/nsEmbedAPI.cpp
View File

@ -141,7 +141,8 @@ nsresult NS_InitEmbedding(nsILocalFile *mozBinDirectory,
{
nsCOMPtr<nsIStringBundle> stringBundle;
char* propertyURL = "chrome://necko/locale/necko.properties";
rv = sBundleService->CreateBundle(propertyURL,
nsILocale *locale = nsnull;
rv = sBundleService->CreateBundle(propertyURL, locale,
getter_AddRefs(stringBundle));
}
#endif

2
embedding/components/ui/helperAppDlg/nsHelperAppDlg.js
View File

@ -96,7 +96,7 @@ nsHelperAppDialog.prototype = {
.createInstance( nsIFilePicker );
var bundle = Components.classes[ "@mozilla.org/intl/stringbundle;1" ]
.getService( Components.interfaces.nsIStringBundleService )
.createBundle( "chrome://global/locale/helperAppLauncher.properties");
.CreateBundle( "chrome://global/locale/helperAppLauncher.properties", null );
var windowTitle = bundle.GetStringFromName( "saveDialogTitle" );

1
embedding/components/windowwatcher/src/nsPrompt.cpp
View File

@ -20,6 +20,7 @@
* Contributor(s):
*/
#include "nsILocale.h"
#include "nsIServiceManager.h"
#include "nsIWalletService.h"
#include "nsPrompt.h"

3
embedding/components/windowwatcher/src/nsPromptService.cpp
View File

@ -592,8 +592,9 @@ nsPromptService::GetLocaleString(const char *aKey, PRUnichar **aResult)
nsCOMPtr<nsIStringBundleService> stringService = do_GetService(kStringBundleServiceCID);
nsCOMPtr<nsIStringBundle> stringBundle;
nsILocale *locale = nsnull;
rv = stringService->CreateBundle(kCommonDialogsProperties, getter_AddRefs(stringBundle));
rv = stringService->CreateBundle(kCommonDialogsProperties, locale, getter_AddRefs(stringBundle));
if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
rv = stringBundle->GetStringFromName(NS_ConvertASCIItoUCS2(aKey).GetUnicode(), aResult);

3
extensions/cookie/nsUtils.cpp
View File

@ -268,8 +268,9 @@ CKutil_Localize(const PRUnichar *genericString) {
PRUnichar *ptrv = nsnull;
NS_WITH_SERVICE(nsIStringBundleService, pStringService, kStringBundleServiceCID, &ret);
if (NS_SUCCEEDED(ret) && (nsnull != pStringService)) {
nsCOMPtr<nsILocale> locale;
nsCOMPtr<nsIStringBundle> bundle;
ret = pStringService->CreateBundle(LOCALIZATION, getter_AddRefs(bundle));
ret = pStringService->CreateBundle(LOCALIZATION, locale, getter_AddRefs(bundle));
if (NS_SUCCEEDED(ret) && bundle) {
ret = bundle->GetStringFromName(genericString, &ptrv);
if ( NS_SUCCEEDED(ret) && (ptrv) ) {

4
extensions/cookie/tests/TestCookie.cpp
View File

@ -90,7 +90,9 @@ int main(PRInt32 argc, char *argv[])
{
nsCOMPtr<nsIStringBundle> stringBundle;
char* propertyURL = "chrome://necko/locale/necko.properties";
rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
nsILocale *locale = nsnull;
rv = bundleService->CreateBundle(propertyURL, locale,
getter_AddRefs(stringBundle));
}
NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv);

1
extensions/p3p/src/nsP3PService.cpp
View File

@ -346,6 +346,7 @@ nsP3PService::Init( ) {
("P3PService: Creating string bundle.\n") );
rv = pStringBundleService->CreateBundle((const char *)xcsSpec,
nsnull,
getter_AddRefs( mStringBundle ) );
}
}

3
extensions/psm-glue/src/nsFSDR.cpp
View File

@ -105,6 +105,7 @@ Wallet_Localize(char* genericString) {
NS_RELEASE(url);
return v.ToNewUnicode();
}
nsILocale* locale = nsnull;
nsIStringBundle* bundle = nsnull;
char* spec = nsnull;
ret = url->GetSpec(&spec);
@ -115,7 +116,7 @@ Wallet_Localize(char* genericString) {
nsCRT::free(spec);
return v.ToNewUnicode();
}
ret = pStringService->CreateBundle(spec, &bundle);
ret = pStringService->CreateBundle(spec, locale, &bundle);
nsCRT::free(spec);
if (NS_FAILED(ret)) {
printf("cannot create instance\n");

3
extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp
View File

@ -167,7 +167,8 @@ nsSecureBrowserUIImpl::Init(nsIDOMWindowInternal *window, nsIDOMElement *button)
NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, getter_AddRefs(mStringBundle));
nsILocale* locale = nsnull;
rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, locale, getter_AddRefs(mStringBundle));
if (NS_FAILED(rv)) return rv;
// hook up to the form post notifications:

4
extensions/wallet/src/wallet.cpp
View File

@ -49,6 +49,7 @@
#include "nsAppDirectoryServiceDefs.h"
#include "nsIStringBundle.h"
#include "nsILocale.h"
#include "nsIFileSpec.h"
#include "prmem.h"
#include "prprf.h"
@ -462,8 +463,9 @@ Wallet_Localize(char* genericString) {
#endif
return v.ToNewUnicode();
}
nsCOMPtr<nsILocale> locale;
nsCOMPtr<nsIStringBundle> bundle;
ret = pStringService->CreateBundle(PROPERTIES_URL, getter_AddRefs(bundle));
ret = pStringService->CreateBundle(PROPERTIES_URL, locale, getter_AddRefs(bundle));
if (NS_FAILED(ret)) {
#ifdef DEBUG
printf("cannot create instance\n");

7
intl/strres/public/nsIStringBundle.idl
View File

@ -22,9 +22,12 @@
#include "nsISupports.idl"
#include "nsIEnumerator.idl"
#include "nsILocale.idl"
%{C++
#include "nsILocale.h"
// Define Contractid and CID
// {D85A17C1-AA7C-11d2-9B8C-00805F8A16D9}
#define NS_STRINGBUNDLESERVICE_CID \
@ -91,8 +94,10 @@ interface nsIStringBundle : nsISupports
[scriptable, uuid(D85A17C0-AA7C-11d2-9B8C-00805F8A16D9)]
interface nsIStringBundleService : nsISupports
{
nsIStringBundle CreateBundle([const] in string aURLSpec);
nsIStringBundle CreateBundle([const] in string aURLSpec,
in nsILocale aLocale);
nsIStringBundle CreateAsyncBundle([const] in string aURLSpec);
nsIStringBundle CreateExtensibleBundle([const] in string aRegistryKey);
/**

7
intl/strres/src/nsAcceptLang.cpp
View File

@ -27,6 +27,7 @@
#include "nsIServiceManager.h"
#include "nsID.h"
#include "nsString.h"
#include "nsILocale.h"
#include "nsIStringBundle.h"
#include "nsAcceptLang.h"
@ -86,10 +87,10 @@ nsAcceptLang::GetAcceptLangFromLocale(const PRUnichar *aLocale, PRUnichar **_ret
nsIStringBundle *bundle = nsnull;
#if 1
res = sBundleService->CreateBundle("resource:/res/language.properties",
&bundle);
nsnull, &bundle);
#else
res = sBundleService->CreateBundle("chrome://global/locale/languageNames.properties",
&bundle);
nsnull, &bundle);
#endif
PRUnichar *ptrv = nsnull;
nsString lc_tmp(aLocale);
@ -181,7 +182,7 @@ nsAcceptLang::GetLocaleFromAcceptLang(const PRUnichar *aName, PRUnichar **_retva
nsIStringBundle *bundle = nsnull;
/* shall we put the file in res/ instead ? */
res = sBundleService->CreateBundle("chrome://global/locale/accept2locale.properties",
&bundle);
nsnull, &bundle);
PRUnichar *ptrv = nsnull;
if (NS_OK == (res = bundle->GetStringFromName(acceptLang.GetUnicode(), &ptrv))) {

5
intl/strres/src/nsStringBundle.cpp
View File

@ -606,7 +606,7 @@ nsExtensibleStringBundle::Init(const char * aRegistryKey)
res = registry->GetStringUTF8(key, "name", getter_Copies(name));
if (NS_FAILED(res)) return res;
res = sbServ->CreateBundle(name, getter_AddRefs(bundle));
res = sbServ->CreateBundle(name, nsnull, getter_AddRefs(bundle));
if (NS_FAILED(res)) {
res = components->Next();
if (NS_FAILED(res)) return res;
@ -956,7 +956,8 @@ nsStringBundleService::recycleEntry(bundleCacheEntry_t *aEntry)
}
NS_IMETHODIMP
nsStringBundleService::CreateBundle(const char* aURLSpec, nsIStringBundle** aResult)
nsStringBundleService::CreateBundle(const char* aURLSpec, nsILocale* aLocale,
nsIStringBundle** aResult)
{
#ifdef DEBUG_tao_
printf("\n++ nsStringBundleService::CreateBundle ++\n");

54
intl/strres/tests/StringBundleTest.cpp
View File

@ -27,6 +27,7 @@
#include "nsIStringBundle.h"
#include "nsIAcceptLang.h"
#include "nsIEventQueueService.h"
#include "nsILocale.h"
#include <iostream.h>
#include "nsIIOService.h"
@ -77,9 +78,54 @@ static NS_DEFINE_IID(kIAcceptLangIID, NS_IACCEPTLANG_IID);
//
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
#include "nsILocale.h"
#include "nsILocaleService.h"
#include "nsLocaleCID.h"
//
//
//
nsILocale*
get_applocale(void)
{
nsresult result;
nsILocale* locale;
nsString* category;
nsString* value;
PRUnichar *lc_name_unichar;
// get a locale service
nsCOMPtr<nsILocaleService> localeService = do_GetService(NS_LOCALESERVICE_CONTRACTID, &result);
NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: get locale service failed");
//
// test GetApplicationLocale
//
result = localeService->GetApplicationLocale(&locale);
NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(locale!=NULL,"nsLocaleTest: factory_get_locale failed");
//
// test and make sure the locale is a valid Interface
//
locale->AddRef();
category = new nsString();
category->AssignWithConversion("NSILOCALE_MESSAGES");
value = new nsString();
result = locale->GetCategory(category->GetUnicode(),&lc_name_unichar);
value->Assign(lc_name_unichar);
NS_ASSERTION(NS_SUCCEEDED(result),"nsLocaleTest: factory_get_locale failed");
NS_ASSERTION(value->Length()>0,"nsLocaleTest: factory_get_locale failed");
locale->Release();
delete category;
delete value;
return locale;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
//
@ -143,9 +189,15 @@ main(int argc, char *argv[])
}
printf("\n ** created AcceptLang service\n");
nsILocale* locale = get_applocale();
nsIStringBundle* bundle = nsnull;
ret = service->CreateBundle(TEST_URL, &bundle);
ret = service->CreateBundle(TEST_URL, locale, &bundle);
/* free it
*/
locale->Release();
if (NS_FAILED(ret)) {
printf("cannot create instance\n");

3
layout/forms/nsFormControlHelper.cpp
View File

@ -895,7 +895,8 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char*
nsXPIDLCString spec;
rv = uri->GetSpec(getter_Copies(spec));
if (NS_SUCCEEDED(rv) && spec) {
rv = stringService->CreateBundle(spec, getter_AddRefs(bundle));
nsCOMPtr<nsILocale> locale = nsnull;
rv = stringService->CreateBundle(spec, locale, getter_AddRefs(bundle));
}
}
}

3
layout/html/forms/src/nsFormControlHelper.cpp
View File

@ -895,7 +895,8 @@ nsFormControlHelper::GetLocalizedString(const char * aPropFileName, const char*
nsXPIDLCString spec;
rv = uri->GetSpec(getter_Copies(spec));
if (NS_SUCCEEDED(rv) && spec) {
rv = stringService->CreateBundle(spec, getter_AddRefs(bundle));
nsCOMPtr<nsILocale> locale = nsnull;
rv = stringService->CreateBundle(spec, locale, getter_AddRefs(bundle));
}
}
}

1
layout/xul/base/src/nsMenuFrame.cpp
View File

@ -1280,6 +1280,7 @@ nsMenuFrame::BuildAcceleratorText(nsString& aAccelString)
if (NS_SUCCEEDED(rv) && bundleService) {
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://global/locale/keys.properties",
nsnull,
getter_AddRefs(bundle));
if (NS_SUCCEEDED(rv) && bundle) {

3
mailnews/absync/src/nsABSyncDriver.cpp
View File

@ -232,7 +232,8 @@ nsAbSyncDriver::GetString(const PRUnichar *aStringName)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle));
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(mStringBundle));
}
}

3
mailnews/absync/src/nsAbSync.cpp
View File

@ -2998,7 +2998,8 @@ nsAbSync::GetString(const PRUnichar *aStringName)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle));
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(mStringBundle));
}
}

3
mailnews/base/src/nsMessenger.cpp
View File

@ -1737,7 +1737,8 @@ nsMessenger::InitStringBundle()
kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL,
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale,
getter_AddRefs(mStringBundle));
}
}

1
mailnews/base/src/nsMessengerMigrator.cpp
View File

@ -409,6 +409,7 @@ nsMessengerMigrator::initializeStrings()
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties",
nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);

1
mailnews/base/src/nsMsgAccountManagerDS.cpp
View File

@ -898,6 +898,7 @@ nsMsgAccountManagerDataSource::getStringBundle()
if (NS_FAILED(rv)) return rv;
rv = strBundleService->CreateBundle("chrome://messenger/locale/prefs.properties",
nsnull, // default locale
getter_AddRefs(mStringBundle));
return rv;
}

2
mailnews/base/src/nsMsgDBView.cpp
View File

@ -182,7 +182,7 @@ PRUnichar * nsMsgDBView::GetString(const PRUnichar *aStringName)
char *propertyURL = MESSENGER_STRING_URL;
nsCOMPtr<nsIStringBundleService> sBundleService = do_GetService(kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && sBundleService)
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mMessengerStringBundle));
res = sBundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(mMessengerStringBundle));
}
if (mMessengerStringBundle)

3
mailnews/base/src/nsMsgFolderCompactor.cpp
View File

@ -227,7 +227,8 @@ nsresult nsFolderCompactState::GetStatusFromMsgName(const char *statusMsgName, P
kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
res = sBundleService->CreateBundle(propertyURL, nsnull,
getter_AddRefs(stringBundle));
}
if (stringBundle)
{

3
mailnews/base/src/nsMsgOfflineManager.cpp
View File

@ -265,7 +265,8 @@ nsresult nsMsgOfflineManager::ShowStatus(const char *statusMsgName)
kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle));
res = sBundleService->CreateBundle(propertyURL, nsnull,
getter_AddRefs(mStringBundle));
}
}
if (mStringBundle)

3
mailnews/base/src/nsMsgPrintEngine.cpp
View File

@ -399,7 +399,8 @@ nsMsgPrintEngine::GetString(const PRUnichar *aStringName)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle));
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(mStringBundle));
}
}

1
mailnews/base/src/nsMsgStatusFeedback.cpp
View File

@ -58,6 +58,7 @@ nsMsgStatusFeedback::nsMsgStatusFeedback() :
if (NS_SUCCEEDED(rv))
bundleService->CreateBundle("chrome://messenger/locale/messenger.properties",
nsnull,
getter_AddRefs(mBundle));
}
}

1
mailnews/base/util/nsMsgFolder.cpp
View File

@ -188,6 +188,7 @@ nsMsgFolder::initializeStrings()
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties",
nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);

3
mailnews/base/util/nsMsgIncomingServer.cpp
View File

@ -1276,7 +1276,8 @@ NS_IMETHODIMP nsMsgIncomingServer::DisplayOfflineMsg(nsIMsgWindow *aMsgWindow)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(BASE_MSGS_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(BASE_MSGS_URL, nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
if (bundle)
{

2
mailnews/compose/src/nsMsgComposeStringBundle.cpp
View File

@ -86,7 +86,7 @@ nsComposeStringService::InitializeStringBundle()
nsCOMPtr<nsIStringBundleService> stringService = do_GetService(kStringBundleServiceCID);
NS_ENSURE_TRUE(stringService, NS_ERROR_FAILURE);
NS_ENSURE_SUCCESS(stringService->CreateBundle(COMPOSE_BE_URL, getter_AddRefs(mComposeStringBundle)),
NS_ENSURE_SUCCESS(stringService->CreateBundle(COMPOSE_BE_URL, nsnull, getter_AddRefs(mComposeStringBundle)),
NS_ERROR_FAILURE);
return NS_OK;
}

4
mailnews/imap/src/nsImapIncomingServer.cpp
View File

@ -1793,7 +1793,9 @@ nsresult nsImapIncomingServer::GetStringBundle()
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(m_stringBundle));
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(m_stringBundle));
}
}
return (m_stringBundle) ? NS_OK : res;

4
mailnews/imap/src/nsImapStringBundle.cpp
View File

@ -46,8 +46,10 @@ IMAPGetStringByID(PRInt32 stringID)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
nsILocale *locale = nsnull;
nsIStringBundle* sBundle = nsnull;
res = sBundleService->CreateBundle(propertyURL, &sBundle);
res = sBundleService->CreateBundle(propertyURL, locale, &sBundle);
if (NS_SUCCEEDED(res))
{

3
mailnews/import/eudora/src/nsEudoraStringBundle.cpp
View File

@ -45,7 +45,8 @@ nsIStringBundle *nsEudoraStringBundle::GetStringBundle( void)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) {
rv = sBundleService->CreateBundle(propertyURL, &sBundle);
nsILocale * locale = nsnull;
rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle);
}
m_pBundle = sBundle;

3
mailnews/import/oexpress/nsOEStringBundle.cpp
View File

@ -48,7 +48,8 @@ nsIStringBundle *nsOEStringBundle::GetStringBundle( void)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) {
rv = sBundleService->CreateBundle(propertyURL, &sBundle);
nsILocale * locale = nsnull;
rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle);
}
m_pBundle = sBundle;

3
mailnews/import/outlook/src/nsOutlookStringBundle.cpp
View File

@ -48,7 +48,8 @@ nsIStringBundle *nsOutlookStringBundle::GetStringBundle( void)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) {
rv = sBundleService->CreateBundle(propertyURL, &sBundle);
nsILocale * locale = nsnull;
rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle);
}
m_pBundle = sBundle;

3
mailnews/import/src/nsImportStringBundle.cpp
View File

@ -48,7 +48,8 @@ nsIStringBundle *nsImportStringBundle::GetStringBundle( void)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) {
rv = sBundleService->CreateBundle(propertyURL, &sBundle);
nsILocale * locale = nsnull;
rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle);
}
m_pBundle = sBundle;

3
mailnews/import/text/src/nsTextStringBundle.cpp
View File

@ -45,7 +45,8 @@ nsIStringBundle *nsTextStringBundle::GetStringBundle( void)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &rv);
if (NS_SUCCEEDED(rv) && (nsnull != sBundleService)) {
rv = sBundleService->CreateBundle(propertyURL, &sBundle);
nsILocale * locale = nsnull;
rv = sBundleService->CreateBundle(propertyURL, locale, &sBundle);
}
m_pBundle = sBundle;

2
mailnews/local/src/nsLocalStringBundle.cpp
View File

@ -85,7 +85,7 @@ nsLocalStringService::InitializeStringBundle()
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(stringService, NS_ERROR_FAILURE);
rv = stringService->CreateBundle(LOCAL_MSGS_URL, getter_AddRefs(mLocalStringBundle));
rv = stringService->CreateBundle(LOCAL_MSGS_URL, nsnull, getter_AddRefs(mLocalStringBundle));
return rv;
}

1
mailnews/local/src/nsPop3IncomingServer.cpp
View File

@ -102,6 +102,7 @@ nsPop3IncomingServer::initializeStrings()
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle("chrome://messenger/locale/messenger.properties",
nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);

2
modules/libpref/src/nsPrefBranch.cpp
View File

@ -623,7 +623,7 @@ nsresult nsPrefBranch::GetDefaultFromPropertiesFile(const char *aPrefName, PRUni
return rv;
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(propertyFileURL,
rv = bundleService->CreateBundle(propertyFileURL, nsnull,
getter_AddRefs(bundle));
if (NS_FAILED(rv))
return rv;

10
modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@ -68,6 +68,7 @@
#include "nsIWindowWatcher.h"
#include "nsHashtable.h"
#include "nsILocale.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIPrincipal.h"
@ -214,6 +215,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
nsCOMPtr<nsIStringBundle> regionalBundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE;
if (!prefs || !prompt || !io || !strings) {
@ -231,11 +233,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL,
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
@ -3299,6 +3301,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
if (nsnull == pluginTag->mLibrary) // if we haven't done this yet
{
nsFileSpec file(pluginTag->mFileName);
nsPluginFile pluginFile(file);
PRLibrary* pluginLibrary = NULL;
@ -4475,6 +4478,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRInt32 buttonPressed;
PRBool checkboxState = PR_FALSE;
@ -4490,7 +4494,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
return rv;
}
rv = strings->CreateBundle(spec, getter_AddRefs(bundle));
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
nsCRT::free(spec);
if (NS_FAILED(rv))
return rv;

10
modules/plugin/nglsrc/nsPluginHostImpl.cpp
View File

@ -68,6 +68,7 @@
#include "nsIWindowWatcher.h"
#include "nsHashtable.h"
#include "nsILocale.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIPrincipal.h"
@ -214,6 +215,7 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
nsCOMPtr<nsIStringBundle> regionalBundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRBool displayDialogPrefValue = PR_FALSE, checkboxState = PR_FALSE;
if (!prefs || !prompt || !io || !strings) {
@ -231,11 +233,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL,
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
@ -3299,6 +3301,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
if (nsnull == pluginTag->mLibrary) // if we haven't done this yet
{
nsFileSpec file(pluginTag->mFileName);
nsPluginFile pluginFile(file);
PRLibrary* pluginLibrary = NULL;
@ -4475,6 +4478,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRInt32 buttonPressed;
PRBool checkboxState = PR_FALSE;
@ -4490,7 +4494,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
return rv;
}
rv = strings->CreateBundle(spec, getter_AddRefs(bundle));
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
nsCRT::free(spec);
if (NS_FAILED(rv))
return rv;

2
profile/pref-migrator/src/nsPrefMigration.cpp
View File

@ -2056,7 +2056,7 @@ nsPrefMigration::DetermineOldPath(nsIFileSpec *profilePath, const char *oldPathN
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, nsnull, getter_AddRefs(bundle));
if (NS_FAILED(rv)) return rv;
nsXPIDLString localizedDirName;