This commit is contained in:
sspitzer%netscape.com 1999-05-04 02:42:21 +00:00
Родитель d57d66ebd5
Коммит 8b0fa76b23
6 изменённых файлов: 3 добавлений и 19 удалений

Просмотреть файл

@ -41,7 +41,6 @@ CPPSRCS = \
nsSmtpProtocol.cpp \ nsSmtpProtocol.cpp \
nsMsgSend.cpp \ nsMsgSend.cpp \
nsMsgSendPart.cpp \ nsMsgSendPart.cpp \
nsMsgPost.cpp \
nsSmtpService.cpp \ nsSmtpService.cpp \
nsJSComposeAppCore.cpp \ nsJSComposeAppCore.cpp \
nsComposeAppCore.cpp \ nsComposeAppCore.cpp \

Просмотреть файл

@ -32,7 +32,6 @@ CPPSRCS= nsMsgCompFields.cpp \
nsSmtpProtocol.cpp \ nsSmtpProtocol.cpp \
MsgCompGlue.cpp \ MsgCompGlue.cpp \
nsMsgSend.cpp \ nsMsgSend.cpp \
nsMsgPost.cpp \
nsMsgSendPart.cpp \ nsMsgSendPart.cpp \
nsSmtpService.cpp \ nsSmtpService.cpp \
nsJSComposeAppCore.cpp \ nsJSComposeAppCore.cpp \
@ -55,7 +54,6 @@ CPP_OBJS= .\$(OBJDIR)\nsMsgCompFields.obj \
.\$(OBJDIR)\nsComposer.obj \ .\$(OBJDIR)\nsComposer.obj \
.\$(OBJDIR)\nsComposerNameSet.obj \ .\$(OBJDIR)\nsComposerNameSet.obj \
.\$(OBJDIR)\nsMsgCompPrefs.obj \ .\$(OBJDIR)\nsMsgCompPrefs.obj \
.\$(OBJDIR)\nsMsgPost.obj \
$(NULL) $(NULL)

Просмотреть файл

@ -54,7 +54,6 @@
#include "nsIMsgCompose.h" #include "nsIMsgCompose.h"
#include "nsIMsgCompFields.h" #include "nsIMsgCompFields.h"
#include "nsIMsgSend.h" #include "nsIMsgSend.h"
#include "nsIMsgPost.h"
// jefft // jefft
#include "nsIXULWindowCallbacks.h" #include "nsIXULWindowCallbacks.h"
@ -78,8 +77,6 @@ static NS_DEFINE_CID(kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID);
static NS_DEFINE_IID(kIMsgSendIID, NS_IMSGSEND_IID); static NS_DEFINE_IID(kIMsgSendIID, NS_IMSGSEND_IID);
static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID); static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID);
static NS_DEFINE_IID(kIMsgPostIID, NS_IMSGPOST_IID);
static NS_DEFINE_CID(kMsgPostCID, NS_MSGPOST_CID);
static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID); static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID);
@ -162,7 +159,6 @@ protected:
nsIMsgCompFields *mMsgCompFields; nsIMsgCompFields *mMsgCompFields;
nsIMsgSend *mMsgSend; nsIMsgSend *mMsgSend;
nsIMsgPost *mMsgPost;
nsAutoString mArgs; nsAutoString mArgs;
@ -238,7 +234,6 @@ nsComposeAppCore::nsComposeAppCore()
mEditor = nsnull; mEditor = nsnull;
mMsgCompFields = nsnull; mMsgCompFields = nsnull;
mMsgSend = nsnull; mMsgSend = nsnull;
mMsgPost = nsnull;
} }
nsComposeAppCore::~nsComposeAppCore() nsComposeAppCore::~nsComposeAppCore()
@ -262,7 +257,6 @@ nsComposeAppCore::~nsComposeAppCore()
NS_IF_RELEASE(mWindow); NS_IF_RELEASE(mWindow);
NS_IF_RELEASE(mEditor); NS_IF_RELEASE(mEditor);
NS_IF_RELEASE(mMsgSend); NS_IF_RELEASE(mMsgSend);
NS_IF_RELEASE(mMsgPost);
NS_IF_RELEASE(mMsgCompFields); NS_IF_RELEASE(mMsgCompFields);
} }
@ -593,15 +587,6 @@ nsComposeAppCore::Init(const nsString& aId)
if (NS_FAILED(res)) return NS_ERROR_FAILURE; if (NS_FAILED(res)) return NS_ERROR_FAILURE;
printf("We succesfully obtained a nsIMsgSend interface....\n"); printf("We succesfully obtained a nsIMsgSend interface....\n");
} }
if (!mMsgPost)
{
res = nsComponentManager::CreateInstance(kMsgPostCID,
NULL,
kIMsgPostIID,
(void **) &mMsgPost);
if (NS_FAILED(res)) return NS_ERROR_FAILURE;
printf("We succesfully obtained a nsIMsgPost interface....\n");
}
if (!mMsgCompFields) if (!mMsgCompFields)
{ {
res = nsComponentManager::CreateInstance(kMsgCompFieldsCID, res = nsComponentManager::CreateInstance(kMsgCompFieldsCID,
@ -902,7 +887,6 @@ NS_IMETHODIMP nsComposeAppCore::SendMessage(nsAutoString& aAddrTo,
if (mMsgSend) if (mMsgSend)
mMsgSend->SendMessage(mMsgCompFields, NULL); mMsgSend->SendMessage(mMsgCompFields, NULL);
} }
if (nsnull != mScriptContext) { if (nsnull != mScriptContext) {
const char* url = ""; const char* url = "";
PRBool isUndefined = PR_FALSE; PRBool isUndefined = PR_FALSE;

Просмотреть файл

Просмотреть файл

Просмотреть файл

@ -73,6 +73,9 @@ nsresult nsSmtpService::SendMailMessage(const nsFilePath& aFilePath, const nsStr
identity->GetSmtpHostname(&hostName); identity->GetSmtpHostname(&hostName);
identity->GetSmtpUsername(&senderName); identity->GetSmtpUsername(&senderName);
// todo: are we leaking hostName and senderName
rv = NS_MsgBuildMailtoUrl(aFilePath, hostName, senderName, aRecipients, aUrlListener, &urlToRun); // this ref counts urlToRun rv = NS_MsgBuildMailtoUrl(aFilePath, hostName, senderName, aRecipients, aUrlListener, &urlToRun); // this ref counts urlToRun
if (NS_SUCCEEDED(rv) && urlToRun) if (NS_SUCCEEDED(rv) && urlToRun)
{ {