зеркало из https://github.com/mozilla/gecko-dev.git
if fcc fails (e.g., imap server has disconnected sent folder connection), offer use chance to retry 163951 sr=mscott
This commit is contained in:
Родитель
3d2de27ccf
Коммит
c29f9417fb
|
@ -222,6 +222,9 @@ noIdentities=You don't have any email identities yet. Create one with the Accou
|
|||
## @name NS_MSG_ERROR_ATTACHING_FILE
|
||||
12570=There was an error attaching %S. Please check if you have access to the file.
|
||||
|
||||
## @name NS_MSG_ERROR_DOING_FCC
|
||||
12571=There was an error copying the message to the Sent folder. Retry?
|
||||
|
||||
## Strings use for the save message dialog shown when the user close a message compose window
|
||||
saveDlogTitle=Save Message
|
||||
saveDlogMessage=Message has not been sent. Do you want to save the message in the Drafts folder?
|
||||
|
|
|
@ -139,5 +139,5 @@ private:
|
|||
#define NS_ERROR_SMTP_PERM_SIZE_EXCEEDED_2 NS_MSG_GENERATE_FAILURE(12569)
|
||||
|
||||
#define NS_MSG_ERROR_ATTACHING_FILE NS_MSG_GENERATE_FAILURE(12570)
|
||||
|
||||
#define NS_MSG_ERROR_DOING_FCC NS_MSG_GENERATE_FAILURE(12571)
|
||||
#endif /* _nsMsgComposeStringBundle_H_ */
|
||||
|
|
|
@ -3895,6 +3895,16 @@ nsMsgComposeAndSend::NotifyListenerOnStopCopy(nsresult aStatus)
|
|||
nsCOMPtr<nsIPrompt> prompt;
|
||||
GetDefaultPrompt(getter_AddRefs(prompt));
|
||||
|
||||
if (NS_FAILED(aStatus))
|
||||
{
|
||||
PRBool retry = PR_FALSE;
|
||||
nsMsgAskBooleanQuestionByID(prompt, NS_MSG_ERROR_DOING_FCC, &retry, nsnull /* what title */);
|
||||
if (retry)
|
||||
{
|
||||
return DoFcc();
|
||||
}
|
||||
|
||||
}
|
||||
// Ok, now to support a second copy operation, we need to figure
|
||||
// out which copy request just finished. If the user has requested
|
||||
// a second copy operation, then we need to fire that off, but if they
|
||||
|
|
Загрузка…
Ссылка в новой задаче