зеркало из https://github.com/mozilla/pjs.git
Bug 224587 Biff shouldn't alert for transient IMAP server errors r=bienvenu sr=Henry.Jia
This commit is contained in:
Родитель
c0856a8b98
Коммит
b7a6586030
|
@ -2109,13 +2109,8 @@ NS_IMETHODIMP nsImapIncomingServer::FEAlertFromServer(const char *aString, nsIM
|
||||||
if (aMsgWindow)
|
if (aMsgWindow)
|
||||||
aMsgWindow->GetPromptDialog(getter_AddRefs(dialog));
|
aMsgWindow->GetPromptDialog(getter_AddRefs(dialog));
|
||||||
|
|
||||||
if (!dialog) // if we didn't get one, use the default....
|
if (dialog)
|
||||||
{
|
{
|
||||||
nsCOMPtr<nsIWindowWatcher> wwatch(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
|
|
||||||
if (wwatch)
|
|
||||||
wwatch->GetNewPrompter(0, getter_AddRefs(dialog));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (aString)
|
if (aString)
|
||||||
{
|
{
|
||||||
// skip over the first two words, I guess.
|
// skip over the first two words, I guess.
|
||||||
|
@ -2144,6 +2139,7 @@ NS_IMETHODIMP nsImapIncomingServer::FEAlertFromServer(const char *aString, nsIM
|
||||||
PR_Free(serverSaidPrefix);
|
PR_Free(serverSaidPrefix);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче