Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes for supression of GUI prompts on send operation - for message import - Bug #: 27154 - r: bienvenu

Browse Source
This commit is contained in:
rhp%netscape.com 2000-02-11 01:31:15 +00:00
parent eb18765135
commit 93757e9262
4 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mailnews/compose/public/nsIMsgSend.idl
View File

@ -192,4 +192,5 @@ interface nsIMsgSend : nsISupports
void AddListener(in nsIMsgSendListener aListener);
void RemoveListener(in nsIMsgSendListener aListener);
void SetGUINotificationState(in PRBool aEnableFlag);
};

60
mailnews/compose/src/nsMsgSend.cpp
View File

@ -19,8 +19,7 @@
*
* Contributor(s):
* Pierre Phaneuf <pp@ludusdesign.com>
*/
*/
#include "msgCore.h"
#include "nsCRT.h"
#include "rosetta_mailnews.h"
@ -149,6 +148,7 @@ NS_IMPL_ISUPPORTS(nsMsgComposeAndSend, NS_GET_IID(nsIMsgSend));
nsMsgComposeAndSend::nsMsgComposeAndSend() :
m_messageKey(0xffffffff)
{
mGUINotificationEnabled = PR_TRUE;
mEditor = nsnull;
mMultipartRelatedAttachmentCount = 0;
mCompFields = nsnull; /* Where to send the message once it's done */
@ -596,7 +596,8 @@ nsMsgComposeAndSend::GatherMimeAttachments()
if (! mOutputFile->is_open())
{
status = NS_MSG_UNABLE_TO_OPEN_TMP_FILE;
nsMsgDisplayMessageByID(NS_MSG_UNABLE_TO_OPEN_TMP_FILE);
if (mGUINotificationEnabled)
nsMsgDisplayMessageByID(NS_MSG_UNABLE_TO_OPEN_TMP_FILE);
goto FAIL;
}
@ -2599,7 +2600,7 @@ nsMsgComposeAndSend::DeliverMessage()
// if this is a mongo email...we should have a way to warn the user that
// they are about to do something they may not want to do.
//
if ( (mMessageWarningSize > 0) && (mTempFileSpec->GetFileSize() > mMessageWarningSize) )
if ( (mMessageWarningSize > 0) && (mTempFileSpec->GetFileSize() > mMessageWarningSize) && (mGUINotificationEnabled))
{
PRBool abortTheSend = PR_FALSE;
@ -2742,7 +2743,8 @@ nsMsgComposeAndSend::DeliverFileAsMail()
if (!mMailSendListener)
{
// RICHIE_TODO - message loss here?
nsMsgDisplayMessageByID(NS_ERROR_SENDING_MESSAGE);
if (mGUINotificationEnabled)
nsMsgDisplayMessageByID(NS_ERROR_SENDING_MESSAGE);
return NS_ERROR_OUT_OF_MEMORY;
}
@ -2776,7 +2778,8 @@ nsMsgComposeAndSend::DeliverFileAsNews()
if (!mNewsPostListener)
{
// RICHIE_TODO - message loss here?
nsMsgDisplayMessageByID(NS_ERROR_SENDING_MESSAGE);
if (mGUINotificationEnabled)
nsMsgDisplayMessageByID(NS_ERROR_SENDING_MESSAGE);
return NS_ERROR_OUT_OF_MEMORY;
}
@ -2803,10 +2806,13 @@ nsMsgComposeAndSend::Fail(nsresult failure_code, const PRUnichar * error_msg)
// in certain cases, we've already shown the alert
// and we don't need to show another alert here.
if (failure_code != NS_ERROR_BUT_DONT_SHOW_ALERT) {
if (!error_msg)
nsMsgDisplayMessageByID(failure_code);
else
nsMsgDisplayMessageByString(error_msg);
if (mGUINotificationEnabled)
{
if (!error_msg)
nsMsgDisplayMessageByID(failure_code);
else
nsMsgDisplayMessageByString(error_msg);
}
}
}
@ -2944,9 +2950,12 @@ nsMsgComposeAndSend::DoFcc()
PRUnichar *eMsg = ComposeGetStringByID(NS_MSG_FAILED_COPY_OPERATION);
Fail(NS_ERROR_BUT_DONT_SHOW_ALERT, eMsg);
nsMsgAskBooleanQuestionByString(eMsg, &oopsGiveMeBackTheComposeWindow);
if (!oopsGiveMeBackTheComposeWindow)
rv = NS_OK;
if (mGUINotificationEnabled)
{
nsMsgAskBooleanQuestionByString(eMsg, &oopsGiveMeBackTheComposeWindow);
if (!oopsGiveMeBackTheComposeWindow)
rv = NS_OK;
}
NotifyListenersOnStopCopy(rv);
nsCRT::free(eMsg);
@ -3207,12 +3216,15 @@ nsMsgComposeAndSend::NotifyListenersOnStopCopy(nsresult aStatus)
PRUnichar *eMsg = ComposeGetStringByID(NS_MSG_FAILED_COPY_OPERATION);
Fail(NS_ERROR_BUT_DONT_SHOW_ALERT, eMsg);
nsMsgAskBooleanQuestionByString(eMsg, &oopsGiveMeBackTheComposeWindow);
if (!oopsGiveMeBackTheComposeWindow)
rv = NS_OK;
else
aStatus = NS_ERROR_FAILURE;
if (mGUINotificationEnabled)
{
nsMsgAskBooleanQuestionByString(eMsg, &oopsGiveMeBackTheComposeWindow);
if (!oopsGiveMeBackTheComposeWindow)
rv = NS_OK;
else
aStatus = NS_ERROR_FAILURE;
}
nsCRT::free(eMsg);
}
@ -3974,7 +3986,7 @@ nsMsgComposeAndSend::SetStatusMessage(PRUnichar *aMsgString)
{
PRUnichar *progressMsg;
if ( (!mFeedback) || (!aMsgString) )
if ( (!mFeedback) || (!aMsgString) || (!mGUINotificationEnabled) )
return NS_OK;
nsString formattedString(aMsgString);
@ -3986,3 +3998,11 @@ nsMsgComposeAndSend::SetStatusMessage(PRUnichar *aMsgString)
return NS_OK;
}
// For GUI notification...
nsresult
nsMsgComposeAndSend::SetGUINotificationState(PRBool aEnableFlag)
{
mGUINotificationEnabled = aEnableFlag;
return NS_OK;
}

4
mailnews/compose/src/nsMsgSend.h
View File

@ -264,6 +264,9 @@ public:
NS_IMETHOD SetMessageKey(PRUint32 aMessageKey);
NS_IMETHOD GetMessageId(nsCString* aMessageId);
// For GUI notification...
NS_IMETHOD SetGUINotificationState(PRBool aEnableFlag);
//
// Attachment processing...
//
@ -428,6 +431,7 @@ public:
// or mailbox: loading them in parallel would
// cause multiple connections to the news
// server to be opened, or would cause much seek()ing.
PRBool mGUINotificationEnabled; // Should we throw up the GUI alerts on errors?
void *m_crypto_closure;
HJ77514

2
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
View File

@ -511,6 +511,8 @@ nsMimeBaseEmitter::UpdateCharacterSet(const char *aCharset)
break;
}
}
++ptr;
}
}