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

backout build bustage fix

Browse Source
This commit is contained in:
bienvenu%netscape.com 2001-04-27 05:58:32 +00:00
parent 245d4eb76f
commit d1a6dd1d4b
9 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailnews/mime/cthandlers/signstub/nsSignedStub.cpp
View File

@ -215,7 +215,7 @@ nsCOMPtr<nsIStringBundle> stringBundle = nsnull;
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
res = sBundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(stringBundle));
}
}

4
mailnews/mime/cthandlers/vcard/mimevcrd.cpp
View File

@ -1867,7 +1867,9 @@ nsCOMPtr<nsIStringBundle> stringBundle = nsnull;
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(stringBundle));
}
}

4
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
View File

@ -192,7 +192,9 @@ nsMimeBaseEmitter::MimeGetStringByName(const char *aHeaderName)
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));
}
}

4
mailnews/mime/src/mimemoz2.cpp
View File

@ -1814,7 +1814,9 @@ MimeGetStringByID(PRInt32 stringID)
NS_WITH_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID, &res);
if (NS_SUCCEEDED(res) && (nsnull != sBundleService))
{
res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(stringBundle));
nsILocale *locale = nsnull;
res = sBundleService->CreateBundle(propertyURL, locale, getter_AddRefs(stringBundle));
}
}

6
mailnews/news/src/nsNNTPNewsgroupList.cpp
View File

@ -268,7 +268,7 @@ nsNNTPNewsgroupList::GetRangeOfArtsToDownload(nsIMsgWindow *aMsgWindow,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
rv = bundle->GetStringFromName(NS_LITERAL_STRING("noNewMessages").get(), getter_Copies(statusString));
@ -704,7 +704,7 @@ nsNNTPNewsgroupList::ProcessXOVERLINE(const char *line, PRUint32 *status)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
const PRUnichar *formatStrings[2] = { numDownloadedStr.GetUnicode(), totalToDownloadStr.GetUnicode() };
@ -798,7 +798,7 @@ nsNNTPNewsgroupList::FinishXOVERLINE(int status, int *newstatus)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
const PRUnichar *formatStrings[2] = { firstStr.GetUnicode(), lastStr.GetUnicode() };

8
mailnews/news/src/nsNNTPProtocol.cpp
View File

@ -3163,7 +3163,7 @@ PRInt32 nsNNTPProtocol::ReadNewsList(nsIInputStream * inputStream, PRUint32 leng
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL,
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull,
getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
@ -3625,7 +3625,7 @@ nsresult nsNNTPProtocol::GetNewsStringByID(PRInt32 stringID, PRUnichar **aString
nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(m_stringBundle));
rv = bundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(m_stringBundle));
NS_ENSURE_SUCCESS(rv, rv);
}
@ -3661,7 +3661,7 @@ nsresult nsNNTPProtocol::GetNewsStringByName(const char *aName, PRUnichar **aStr
nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = bundleService->CreateBundle(propertyURL, getter_AddRefs(m_stringBundle));
rv = bundleService->CreateBundle(propertyURL, nsnull, getter_AddRefs(m_stringBundle));
}
if (m_stringBundle)
@ -3858,7 +3858,7 @@ nsNNTPProtocol::SetCheckingForNewNewsStatus(PRInt32 current, PRInt32 total)
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString thisGroupStr; thisGroupStr.AppendInt(current);

14
mailnews/news/src/nsNewsDownloader.cpp
View File

@ -33,7 +33,6 @@
#include "nsRDFCID.h"
#include "nsIMsgAccountManager.h"
#include "nsMsgFolderFlags.h"
#include "nsIStreamObserver.h"
// This file contains the news article download state machine.
static NS_DEFINE_CID(kNntpServiceCID, NS_NNTPSERVICE_CID);
@ -71,9 +70,6 @@ nsNewsDownloader::nsNewsDownloader(nsIMsgWindow *window, nsIMsgDatabase *msgDB,
m_abort = PR_FALSE;
m_listener = listener;
m_window = window;
// not the perfect place for this, but I think it will work.
if (m_window)
m_window->SetStopped(PR_FALSE);
NS_INIT_REFCNT();
}
@ -95,13 +91,7 @@ NS_IMETHODIMP nsNewsDownloader::OnStartRunningUrl(nsIURI* url)
NS_IMETHODIMP nsNewsDownloader::OnStopRunningUrl(nsIURI* url, nsresult exitCode)
{
PRBool stopped = PR_FALSE;
if (m_window)
m_window->GetStopped(&stopped);
if (stopped)
exitCode = NS_BINDING_ABORTED;
nsresult rv = exitCode;
nsresult rv = exitCode;
if (NS_SUCCEEDED(exitCode) || exitCode == NS_MSG_NEWS_ARTICLE_NOT_FOUND)
rv = DownloadNext(PR_FALSE);
@ -202,7 +192,7 @@ PRBool nsNewsDownloader::GetNextHdrToRetrieve()
nsCOMPtr<nsIStringBundleService> bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsAutoString firstStr;

2
mailnews/news/src/nsNewsFolder.cpp
View File

@ -949,7 +949,7 @@ nsMsgNewsFolder::DeleteMessages(nsISupportsArray *messages, nsIMsgWindow *aMsgWi
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIStringBundle> bundle;
rv = bundleService->CreateBundle(NEWS_MSGS_URL, getter_AddRefs(bundle));
rv = bundleService->CreateBundle(NEWS_MSGS_URL, nsnull, getter_AddRefs(bundle));
NS_ENSURE_SUCCESS(rv, rv);
nsXPIDLString alertText;

3
netwerk/base/src/nsSocketTransportService.cpp
View File

@ -696,7 +696,8 @@ nsSocketTransportService::GetNeckoStringByName (const char *aName, PRUnichar **a
NS_WITH_PROXIED_SERVICE(nsIStringBundleService, sBundleService, kStringBundleServiceCID,
NS_UI_THREAD_EVENTQ, &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));
}
}