Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-13 18:27:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug #245430 --> Port more thunderbird static build work to the trunk. Get rid of a static string class

Browse Source 
from nsImapProtocol to avoid an OS X static build crash.

sr=bienvenu
This commit is contained in:
scott%scott-macgregor.org 2004-06-10 23:51:32 +00:00
parent 9979237075
commit 8b3b9e40f2
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
mailnews/imap/src/nsImapProtocol.cpp
View File

@ -127,7 +127,6 @@ static NS_DEFINE_CID(kStreamListenerTeeCID, NS_STREAMLISTENERTEE_CID);
#define IMAP_ENV_AND_DB_HEADERS IMAP_ENV_HEADERS IMAP_DB_HEADERS
static const PRIntervalTime kImapSleepTime = PR_MillisecondsToInterval(1000);
static PRInt32 gPromoteNoopToCheckCount = 0;
nsXPIDLString nsImapProtocol::mAcceptLanguages;
static const PRUint32 kFlagChangesBeforeCheck = 10;
static const PRInt32 kMaxSecondsBeforeCheck = 600;
@ -339,14 +338,6 @@ nsresult nsImapProtocol::GlobalInitialization()
prefBranch->GetBoolPref("mail.imap.use_envelope_cmd",
&gUseEnvelopeCmd);
prefBranch->GetBoolPref("mail.imap.use_literal_plus", &gUseLiteralPlus);
nsCOMPtr<nsIPrefLocalizedString> prefString;
prefBranch->GetComplexValue("intl.accept_languages",
NS_GET_IID(nsIPrefLocalizedString),
getter_AddRefs(prefString));
if (prefString) {
prefString->ToString(getter_Copies(mAcceptLanguages));
}
return NS_OK;
}
@ -367,6 +358,18 @@ nsImapProtocol::nsImapProtocol() : nsMsgProtocol(nsnull),
if (!gInitialized)
GlobalInitialization();
// read in the accept languages preference
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID));
if (prefBranch)
{
nsCOMPtr<nsIPrefLocalizedString> prefString;
prefBranch->GetComplexValue("intl.accept_languages",
NS_GET_IID(nsIPrefLocalizedString),
getter_AddRefs(prefString));
if (prefString)
prefString->ToString(getter_Copies(mAcceptLanguages));
}
// ***** Thread support *****
m_thread = nsnull;
m_dataAvailableMonitor = nsnull;

2
mailnews/imap/src/nsImapProtocol.h
View File

@ -604,7 +604,7 @@ private:
nsCString m_logonCookie;
PRInt16 m_logonPort;
static nsXPIDLString mAcceptLanguages;
nsXPIDLString mAcceptLanguages;
// progress stuff
void SetProgressString(PRInt32 stringId);