зеркало из https://github.com/mozilla/pjs.git
making go offline more robust in the face of errors r=naving sr=sspitzer 101712
This commit is contained in:
Родитель
2faf4a68e7
Коммит
015f85de2f
|
@ -692,7 +692,7 @@ nsImapIncomingServer::CreateImapConnection(nsIEventQueue *aEventQueue,
|
|||
if (NS_SUCCEEDED(rv))
|
||||
rv = mailnewsUrl->GetMsgWindow(getter_AddRefs(aMsgWindow));
|
||||
|
||||
RequestOverrideInfo(aMsgWindow);
|
||||
rv = RequestOverrideInfo(aMsgWindow);
|
||||
if (m_waitingForConnectionInfo)
|
||||
canRunButBusy = PR_TRUE;
|
||||
else
|
||||
|
|
|
@ -2056,7 +2056,7 @@ NS_IMETHODIMP nsImapMailFolder::GetNewMessages(nsIMsgWindow *aWindow, nsIUrlList
|
|||
if(NS_SUCCEEDED(rv) && rootFolder) {
|
||||
|
||||
nsCOMPtr<nsIImapIncomingServer> imapServer;
|
||||
nsresult rv = GetImapIncomingServer(getter_AddRefs(imapServer));
|
||||
rv = GetImapIncomingServer(getter_AddRefs(imapServer));
|
||||
|
||||
if (NS_SUCCEEDED(rv) && imapServer)
|
||||
imapServer->GetDownloadBodiesOnGetNewMail(&m_downloadingFolderForOfflineUse);
|
||||
|
|
|
@ -931,7 +931,11 @@ nsresult nsImapOfflineDownloader::ProcessNextOperation()
|
|||
PRUint32 numFolders;
|
||||
rootMsgFolder->GetFoldersWithFlag(MSG_FOLDER_FLAG_INBOX, 1, &numFolders, getter_AddRefs(inbox));
|
||||
if (inbox)
|
||||
return inbox->GetNewMessages(m_window, this);
|
||||
{
|
||||
rv = inbox->GetNewMessages(m_window, this);
|
||||
if (NS_SUCCEEDED(rv))
|
||||
return rv; // otherwise, fall through.
|
||||
}
|
||||
}
|
||||
}
|
||||
return ProcessNextOperation(); // recurse and do next server.
|
||||
|
|
Загрузка…
Ссылка в новой задаче