зеркало из https://github.com/mozilla/pjs.git
Fix for bug 54481. If nsMsgDisplayMessageByID failed likely because we don't have astring for the error, try again with NS_ERROR_SEND_FAILED. R=putterman, SR=alecf
This commit is contained in:
Родитель
442477851e
Коммит
93ec643b2b
|
@ -717,7 +717,8 @@ nsresult nsMsgCompose::SendMsg(MSG_DeliverMode deliverMode, nsIMsgIdentity *ide
|
||||||
{
|
{
|
||||||
ShowWindow(PR_TRUE);
|
ShowWindow(PR_TRUE);
|
||||||
if (rv != NS_ERROR_BUT_DONT_SHOW_ALERT)
|
if (rv != NS_ERROR_BUT_DONT_SHOW_ALERT)
|
||||||
nsMsgDisplayMessageByID(prompt, rv);
|
if (NS_FAILED(nsMsgDisplayMessageByID(prompt, rv)))
|
||||||
|
nsMsgDisplayMessageByID(prompt, NS_ERROR_SEND_FAILED);
|
||||||
}
|
}
|
||||||
|
|
||||||
return rv;
|
return rv;
|
||||||
|
@ -821,7 +822,8 @@ nsMsgCompose::SendMsgEx(MSG_DeliverMode deliverMode,
|
||||||
nsCOMPtr<nsIPrompt> prompt;
|
nsCOMPtr<nsIPrompt> prompt;
|
||||||
if (m_window)
|
if (m_window)
|
||||||
m_window->GetPrompter(getter_AddRefs(prompt));
|
m_window->GetPrompter(getter_AddRefs(prompt));
|
||||||
nsMsgDisplayMessageByID(prompt, rv);
|
if (NS_FAILED(nsMsgDisplayMessageByID(prompt, rv)))
|
||||||
|
nsMsgDisplayMessageByID(prompt, NS_ERROR_SEND_FAILED);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return rv;
|
return rv;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче