fix checknew mail on startup for multiple accounts, 85227 r=cavin, sr=sspitzer, a=asa

This commit is contained in:
bienvenu%netscape.com 2002-12-05 19:18:16 +00:00
Родитель 4ce2d3a60f
Коммит f5f30c3255
2 изменённых файлов: 4 добавлений и 7 удалений

Просмотреть файл

@ -718,10 +718,7 @@ function loadStartFolder(initialUri)
dump('Exception in LoadStartFolder caused by no default account. We know about this\n'); dump('Exception in LoadStartFolder caused by no default account. We know about this\n');
} }
if (!initialUri) MsgGetMessagesForAllServers(defaultServer);
{
MsgGetMessagesForAllServers(null);
}
} }
function TriggerGetMessages(server) function TriggerGetMessages(server)

Просмотреть файл

@ -329,16 +329,16 @@ nsresult nsMsgBiffManager::PerformBiff()
{ {
PRBool serverBusy = PR_FALSE; PRBool serverBusy = PR_FALSE;
PRBool serverRequiresPassword = PR_TRUE; PRBool serverRequiresPassword = PR_TRUE;
nsXPIDLCString password; PRBool userAuthenticated;
// we don't want to prompt the user for password UI so pass in false to // 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 // the server->GetPassword method. If we don't already know the passsword then
// we just won't biff this server // we just won't biff this server
current->server->GetPassword(getter_Copies(password)); current->server->GetIsAuthenticated(&userAuthenticated);
current->server->GetServerBusy(&serverBusy); current->server->GetServerBusy(&serverBusy);
current->server->GetServerRequiresPasswordForBiff(&serverRequiresPassword); current->server->GetServerRequiresPasswordForBiff(&serverRequiresPassword);
//Make sure we're logged on before doing a biff //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 // 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(); current->server->PerformBiff();
mBiffArray->RemoveElementAt(i); mBiffArray->RemoveElementAt(i);
i--; //Because we removed it we need to look at the one that just moved up. i--; //Because we removed it we need to look at the one that just moved up.