Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mozilla tree r=tao, sr=alecf. commercial tree r=syd, sr=syd/shaver. lowercasing the first char in JS method calls to createBundle. removing the dead locale parameter in the CreateBundle() method call. 76332

Browse Source
This commit is contained in:
valeski%netscape.com 2001-04-27 05:13:10 +00:00
parent a3c24a7017
commit 1d2fe07528
4 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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, nsnull,
rv = bundleService->CreateBundle(propertyFileURL,
getter_AddRefs(bundle));
if (NS_FAILED(rv))
return rv;

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

@ -68,7 +68,6 @@
#include "nsIWindowWatcher.h"
#include "nsHashtable.h"
#include "nsILocale.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIPrincipal.h"
@ -215,7 +214,6 @@ 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) {
@ -233,11 +231,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
@ -3301,7 +3299,6 @@ 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;
@ -4478,7 +4475,6 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRInt32 buttonPressed;
PRBool checkboxState = PR_FALSE;
@ -4494,7 +4490,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
return rv;
}
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(spec, getter_AddRefs(bundle));
nsCRT::free(spec);
if (NS_FAILED(rv))
return rv;

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

@ -68,7 +68,6 @@
#include "nsIWindowWatcher.h"
#include "nsHashtable.h"
#include "nsILocale.h"
#include "nsIScriptGlobalObject.h"
#include "nsIScriptGlobalObjectOwner.h"
#include "nsIPrincipal.h"
@ -215,7 +214,6 @@ 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) {
@ -233,11 +231,11 @@ void DisplayNoDefaultPluginDialog(const char *mimeType)
// Taken from mozilla\extensions\wallet\src\wallet.cpp
// WalletLocalize().
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(PLUGIN_PROPERTIES_URL, getter_AddRefs(bundle));
if (NS_FAILED(rv)) {
return;
}
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL, locale,
rv = strings->CreateBundle(PLUGIN_REGIONAL_URL,
getter_AddRefs(regionalBundle));
if (NS_FAILED(rv)) {
return;
@ -3301,7 +3299,6 @@ 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;
@ -4478,7 +4475,6 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
nsCOMPtr<nsIStringBundle> bundle;
nsCOMPtr<nsIURI> uri;
char *spec = nsnull;
nsILocale* locale = nsnull;
PRInt32 buttonPressed;
PRBool checkboxState = PR_FALSE;
@ -4494,7 +4490,7 @@ NS_IMETHODIMP nsPluginHostImpl::HandleBadPlugin(PRLibrary* aLibrary)
return rv;
}
rv = strings->CreateBundle(spec, locale, getter_AddRefs(bundle));
rv = strings->CreateBundle(spec, 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, nsnull, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(MIGRATION_PROPERTIES_URL, getter_AddRefs(bundle));
if (NS_FAILED(rv)) return rv;
nsXPIDLString localizedDirName;