зеркало из https://github.com/mozilla/pjs.git
fix checknew mail on startup for multiple accounts, 85227 r=cavin, sr=sspitzer, a=asa
This commit is contained in:
Родитель
64d12d8ed7
Коммит
0f0ecf3706
|
@ -718,10 +718,7 @@ function loadStartFolder(initialUri)
|
|||
dump('Exception in LoadStartFolder caused by no default account. We know about this\n');
|
||||
}
|
||||
|
||||
if (!initialUri)
|
||||
{
|
||||
MsgGetMessagesForAllServers(null);
|
||||
}
|
||||
MsgGetMessagesForAllServers(defaultServer);
|
||||
}
|
||||
|
||||
function TriggerGetMessages(server)
|
||||
|
|
|
@ -329,16 +329,16 @@ nsresult nsMsgBiffManager::PerformBiff()
|
|||
{
|
||||
PRBool serverBusy = PR_FALSE;
|
||||
PRBool serverRequiresPassword = PR_TRUE;
|
||||
nsXPIDLCString password;
|
||||
PRBool userAuthenticated;
|
||||
// we don't want to prompt the user for password UI so pass in false to
|
||||
// the server->GetPassword method. If we don't already know the passsword then
|
||||
// we just won't biff this server
|
||||
current->server->GetPassword(getter_Copies(password));
|
||||
current->server->GetIsAuthenticated(&userAuthenticated);
|
||||
current->server->GetServerBusy(&serverBusy);
|
||||
current->server->GetServerRequiresPasswordForBiff(&serverRequiresPassword);
|
||||
//Make sure we're logged on before doing a biff
|
||||
// and make sure the server isn't already in the middle of downloading new messages
|
||||
if(!serverBusy && (!serverRequiresPassword || (password.Length() > 0)))
|
||||
if(!serverBusy && (!serverRequiresPassword || userAuthenticated))
|
||||
current->server->PerformBiff();
|
||||
mBiffArray->RemoveElementAt(i);
|
||||
i--; //Because we removed it we need to look at the one that just moved up.
|
||||
|
|
Загрузка…
Ссылка в новой задаче