From b60563f9ecbbbfdfc551a6d7dba98be4b6b3a425 Mon Sep 17 00:00:00 2001 From: "ducarroz%netscape.com" Date: Mon, 22 Nov 1999 23:48:42 +0000 Subject: [PATCH] Fix for bug 19404. We need to return an error code when the SMTP server name is missing. R=mscott git-svn-id: svn://10.0.0.236/trunk@54216 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/compose/src/nsMsgCompose.cpp | 6 ++++-- mozilla/mailnews/compose/src/nsSmtpProtocol.cpp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.cpp b/mozilla/mailnews/compose/src/nsMsgCompose.cpp index 4bf66600f4a..823ac0d0518 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompose.cpp @@ -532,7 +532,8 @@ nsresult nsMsgCompose::SendMsg(MSG_DeliverMode deliverMode, if (NS_FAILED(rv)) { ShowWindow(PR_TRUE); - nsMsgDisplayMessageByID(rv); + if (rv != NS_ERROR_BUT_DONT_SHOW_ALERT) + nsMsgDisplayMessageByID(rv); } return rv; @@ -614,7 +615,8 @@ nsMsgCompose::SendMsgEx(MSG_DeliverMode deliverMode, if (NS_FAILED(rv)) { ShowWindow(PR_TRUE); - nsMsgDisplayMessageByID(rv); + if (rv != NS_ERROR_BUT_DONT_SHOW_ALERT) + nsMsgDisplayMessageByID(rv); } return rv; } diff --git a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp index 0b770a8736d..33b83421fcc 100644 --- a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp @@ -1192,7 +1192,7 @@ nsresult nsSmtpProtocol::LoadUrl(nsIURI * aURL, nsISupports * aConsumer ) aMsgUrl->SetUrlState(PR_TRUE, NS_OK); rv = aMsgUrl->SetUrlState(PR_FALSE /* we aren't running the url */, NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER); // set the url as a url currently being run... } - return NS_OK; + return NS_ERROR_BUT_DONT_SHOW_ALERT; }