зеркало из https://github.com/mozilla/pjs.git
fix 373570 alert about folder busy when doing an initial download of pop3 messages after account wizard comes up, sr=mscott
This commit is contained in:
Родитель
89f186cdd4
Коммит
eee5863969
|
@ -918,6 +918,7 @@ function GetMessagesForInboxOnServer(server)
|
|||
|
||||
function MsgGetMessage()
|
||||
{
|
||||
gNewAccountToLoad = null;
|
||||
// if offline, prompt for getting messages
|
||||
if (MailOfflineMgr.isOnline() || MailOfflineMgr.getNewMail())
|
||||
GetFolderMessages();
|
||||
|
|
|
@ -1003,7 +1003,7 @@ function loadStartFolder(initialUri)
|
|||
// or a pop3 account that is deferred or deferred to,
|
||||
// or the case where initialUri is non-null (non-startup)
|
||||
if (!initialUri && isLoginAtStartUpEnabled && gLoadStartFolder
|
||||
&& !defaultServer.isDeferredTo &&
|
||||
&& !defaultServer.isDeferredTo && !gNewAccountToLoad &&
|
||||
defaultServer.rootFolder == defaultServer.rootMsgFolder)
|
||||
defaultServer.PerformBiff(msgWindow);
|
||||
|
||||
|
|
|
@ -300,7 +300,8 @@ function loadInboxForNewAccount()
|
|||
SelectFolder(inboxFolder.URI);
|
||||
window.focus();
|
||||
setTimeout(MsgGetMessage, 0);
|
||||
gNewAccountToLoad = null;
|
||||
// we clear gNewAccountToLoad in MsgGetMessage so that the biff startup
|
||||
// code which runs before can check if we're loading a new account.
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче