зеркало из https://github.com/mozilla/gecko-dev.git
part of fix for #15235. get send later to work again. r=alecf
This commit is contained in:
Родитель
ef6d2a7263
Коммит
9e4cd4394f
|
@ -2039,6 +2039,11 @@ GetFolderURIFromUserPrefs(nsMsgDeliverMode aMode,
|
|||
if (NS_FAILED(rv) || !prefs)
|
||||
return nsnull;
|
||||
rv = prefs->CopyCharPref("mail.default_sendlater_uri", &uri);
|
||||
|
||||
if (NS_FAILED(rv) || !uri) {
|
||||
uri = PR_smprintf("%s", ANY_SERVER);
|
||||
rv = NS_OK;
|
||||
}
|
||||
}
|
||||
else if (aMode == nsMsgSaveAsDraft) // SaveAsDraft (Drafts)
|
||||
{
|
||||
|
|
|
@ -25,6 +25,8 @@
|
|||
#include "nsMsgCompFields.h"
|
||||
#include "nsIMsgSend.h"
|
||||
|
||||
#define ANY_SERVER "anyfolder://"
|
||||
|
||||
NS_BEGIN_EXTERN_C
|
||||
|
||||
//
|
||||
|
|
|
@ -34,8 +34,7 @@
|
|||
#include "nsRDFCID.h"
|
||||
#include "nsIURL.h"
|
||||
#include "nsMsgComposeStringBundle.h"
|
||||
|
||||
#define ANY_SERVER "anyfolder://"
|
||||
#include "nsMsgCompUtils.h"
|
||||
|
||||
static NS_DEFINE_CID(kStandardUrlCID, NS_STANDARDURL_CID);
|
||||
static NS_DEFINE_CID(kMsgCopyServiceCID,NS_MSGCOPYSERVICE_CID);
|
||||
|
|
|
@ -3299,6 +3299,9 @@ nsMsgComposeAndSend::MimeDoFCC(nsFileSpec *input_file,
|
|||
// Need to determine what type of operation failed and set status accordingly.
|
||||
switch (mode)
|
||||
{
|
||||
case nsMsgQueueForLater:
|
||||
status = NS_MSG_UNABLE_TO_SEND_LATER;
|
||||
break;
|
||||
case nsMsgSaveAsDraft:
|
||||
status = NS_MSG_UNABLE_TO_SAVE_DRAFT;
|
||||
break;
|
||||
|
|
Загрузка…
Ссылка в новой задаче