From d3d7c939d86de77998606dbfc4e99e0d8bae9b27 Mon Sep 17 00:00:00 2001 From: "bienvenu%netscape.com" Date: Fri, 27 Apr 2001 05:58:32 +0000 Subject: [PATCH] backout build bustage fix --- mailnews/mime/cthandlers/signstub/nsSignedStub.cpp | 2 +- mailnews/mime/cthandlers/vcard/mimevcrd.cpp | 4 +++- mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp | 4 +++- mailnews/mime/src/mimemoz2.cpp | 4 +++- mailnews/news/src/nsNNTPNewsgroupList.cpp | 6 +++--- mailnews/news/src/nsNNTPProtocol.cpp | 8 ++++---- mailnews/news/src/nsNewsDownloader.cpp | 14 ++------------ mailnews/news/src/nsNewsFolder.cpp | 2 +- netwerk/base/src/nsSocketTransportService.cpp | 3 ++- 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp b/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp index 83cef928048..baaabb18c0f 100644 --- a/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp +++ b/mailnews/mime/cthandlers/signstub/nsSignedStub.cpp @@ -215,7 +215,7 @@ nsCOMPtr 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)); } } diff --git a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp index 50c2fe33f9d..bdd69699492 100644 --- a/mailnews/mime/cthandlers/vcard/mimevcrd.cpp +++ b/mailnews/mime/cthandlers/vcard/mimevcrd.cpp @@ -1867,7 +1867,9 @@ nsCOMPtr 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)); } } diff --git a/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp b/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp index 63d336ebd74..7a9fec28a43 100644 --- a/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp +++ b/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp @@ -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)); } } diff --git a/mailnews/mime/src/mimemoz2.cpp b/mailnews/mime/src/mimemoz2.cpp index 5339b004952..302e2701df8 100644 --- a/mailnews/mime/src/mimemoz2.cpp +++ b/mailnews/mime/src/mimemoz2.cpp @@ -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)); } } diff --git a/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mailnews/news/src/nsNNTPNewsgroupList.cpp index d1366b554f0..c3a35830eae 100644 --- a/mailnews/news/src/nsNNTPNewsgroupList.cpp +++ b/mailnews/news/src/nsNNTPNewsgroupList.cpp @@ -268,7 +268,7 @@ nsNNTPNewsgroupList::GetRangeOfArtsToDownload(nsIMsgWindow *aMsgWindow, NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr 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 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 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() }; diff --git a/mailnews/news/src/nsNNTPProtocol.cpp b/mailnews/news/src/nsNNTPProtocol.cpp index ee3000d52c1..78410bcf37a 100644 --- a/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mailnews/news/src/nsNNTPProtocol.cpp @@ -3163,7 +3163,7 @@ PRInt32 nsNNTPProtocol::ReadNewsList(nsIInputStream * inputStream, PRUint32 leng NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr 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 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 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 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); diff --git a/mailnews/news/src/nsNewsDownloader.cpp b/mailnews/news/src/nsNewsDownloader.cpp index a18c37f140b..0acc5e0a8c8 100644 --- a/mailnews/news/src/nsNewsDownloader.cpp +++ b/mailnews/news/src/nsNewsDownloader.cpp @@ -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 bundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr 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; diff --git a/mailnews/news/src/nsNewsFolder.cpp b/mailnews/news/src/nsNewsFolder.cpp index bc3b00d86af..1f1f5ff6807 100644 --- a/mailnews/news/src/nsNewsFolder.cpp +++ b/mailnews/news/src/nsNewsFolder.cpp @@ -949,7 +949,7 @@ nsMsgNewsFolder::DeleteMessages(nsISupportsArray *messages, nsIMsgWindow *aMsgWi NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr 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; diff --git a/netwerk/base/src/nsSocketTransportService.cpp b/netwerk/base/src/nsSocketTransportService.cpp index dd30122ec1a..4e407c65e0d 100644 --- a/netwerk/base/src/nsSocketTransportService.cpp +++ b/netwerk/base/src/nsSocketTransportService.cpp @@ -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)); } }