зеркало из https://github.com/mozilla/gecko-dev.git
related to bug 14561, fix some other case where we didn't bring back errors while sending message. R=rhp
This commit is contained in:
Родитель
3eaba4f422
Коммит
597d3a160c
|
@ -1060,7 +1060,7 @@ nsMsgComposeAndSend::GatherMimeAttachments()
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DeliverMessage();
|
status = DeliverMessage();
|
||||||
shouldDeleteDeliveryState = PR_FALSE;
|
shouldDeleteDeliveryState = PR_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2074,7 +2074,7 @@ nsMsgComposeAndSend::HackAttachments(const nsMsgAttachmentData *attachments,
|
||||||
|
|
||||||
// If no attachments - finish now (this will call the done_callback).
|
// If no attachments - finish now (this will call the done_callback).
|
||||||
if (m_attachment_pending_count <= 0)
|
if (m_attachment_pending_count <= 0)
|
||||||
GatherMimeAttachments();
|
return GatherMimeAttachments();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -2436,10 +2436,10 @@ nsMsgComposeAndSend::DeliverMessage()
|
||||||
if (mail_p) {
|
if (mail_p) {
|
||||||
mSendMailAlso = PR_TRUE;
|
mSendMailAlso = PR_TRUE;
|
||||||
}
|
}
|
||||||
DeliverFileAsNews(); /* will call DeliverFileAsMail if it needs to */
|
return DeliverFileAsNews(); /* will call DeliverFileAsMail if it needs to */
|
||||||
}
|
}
|
||||||
else if (mail_p) {
|
else if (mail_p) {
|
||||||
DeliverFileAsMail();
|
return DeliverFileAsMail();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
return NS_ERROR_UNEXPECTED;
|
return NS_ERROR_UNEXPECTED;
|
||||||
|
@ -3080,8 +3080,7 @@ nsMsgComposeAndSend::SendMessageFile(
|
||||||
nsnull, nsnull, nsnull);
|
nsnull, nsnull, nsnull);
|
||||||
if (NS_SUCCEEDED(rv))
|
if (NS_SUCCEEDED(rv))
|
||||||
{
|
{
|
||||||
DeliverMessage();
|
return DeliverMessage();
|
||||||
return NS_OK;
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return rv;
|
return rv;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче