Fixing PSM tree to build with new iface for CreateBundle.

Piggy backing onto valeski's check-in.
This commit is contained in:
javi%netscape.com 2001-04-27 21:31:24 +00:00
Родитель 00bca056ef
Коммит 66b818e59f
5 изменённых файлов: 6 добавлений и 8 удалений

Просмотреть файл

@ -128,11 +128,11 @@ nsNSSDialogs::Init()
nsCOMPtr<nsIStringBundleService> service = do_GetService(kCStringBundleServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
rv = service->CreateBundle(STRING_BUNDLE_URL, nsnull,
rv = service->CreateBundle(STRING_BUNDLE_URL,
getter_AddRefs(mStringBundle));
if (NS_FAILED(rv)) return rv;
rv = service->CreateBundle(PIPSTRING_BUNDLE_URL, nsnull,
rv = service->CreateBundle(PIPSTRING_BUNDLE_URL,
getter_AddRefs(mPIPStringBundle));
return rv;
}

Просмотреть файл

@ -317,7 +317,7 @@ nsNSSComponent::InitializePIPNSSBundle()
if (NS_FAILED(rv) || !bundleService)
return NS_ERROR_FAILURE;
bundleService->CreateBundle(PIPNSS_STRBUNDLE_URL, nsnull,
bundleService->CreateBundle(PIPNSS_STRBUNDLE_URL,
getter_AddRefs(mPIPNSSBundle));
if (!mPIPNSSBundle)
rv = NS_ERROR_FAILURE;

Просмотреть файл

@ -119,7 +119,7 @@ nsSecureBrowserUIImpl::Init(nsIDOMWindowInternal *window,
nsCOMPtr<nsIStringBundleService> service(do_GetService(kCStringBundleServiceCID, &rv));
if (NS_FAILED(rv)) return rv;
rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, nsnull,
rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL,
getter_AddRefs(mStringBundle));
if (NS_FAILED(rv)) return rv;

Просмотреть файл

@ -116,7 +116,6 @@ extern "C" nsIStringBundle* nlsCreateBundle(char* bundleURL)
nsresult ret;
nsIStringBundleService *service = nsnull;
nsIStringBundle* bundle = nsnull;
nsILocale *locale = nsnull;
// Get the string bundle service
ret = nsServiceManager::GetService(kStringBundleServiceCID,
@ -127,7 +126,7 @@ extern "C" nsIStringBundle* nlsCreateBundle(char* bundleURL)
}
// Create the bundle
ret = service->CreateBundle(bundleURL, locale, &bundle);
ret = service->CreateBundle(bundleURL, &bundle);
if (NS_FAILED(ret)) {
return NULL;
}

Просмотреть файл

@ -139,7 +139,6 @@ extern "C" nsIStringBundle* nlsCreateBundle(char* bundleURL)
nsresult ret;
nsIStringBundleService *service = nsnull;
nsIStringBundle* bundle = nsnull;
nsILocale *locale = nsnull;
// Get the string bundle service
ret = nsServiceManager::GetService(kStringBundleServiceCID,
@ -150,7 +149,7 @@ extern "C" nsIStringBundle* nlsCreateBundle(char* bundleURL)
}
// Create the bundle
ret = service->CreateBundle(bundleURL, locale, &bundle);
ret = service->CreateBundle(bundleURL, &bundle);
if (NS_FAILED(ret)) {
return NULL;
}