зеркало из https://github.com/mozilla/gecko-dev.git
more on copy service - online Sent/Drafts/Templates support
This commit is contained in:
jefft%netscape.com
Родитель
621bc564e2
Коммит
8e63bb4c25
|
|
@ -45,32 +45,48 @@ CopyListener::~CopyListener(void)
|
|||
}
|
||||
|
||||
nsresult
|
||||
CopyListener::OnStartCopy(nsISupports *listenerData)
|
||||
CopyListener::OnStartCopy()
|
||||
{
|
||||
#ifdef NS_DEBUG
|
||||
printf("CopyListener::OnStartCopy()\n");
|
||||
#endif
|
||||
|
||||
if (mComposeAndSend)
|
||||
mComposeAndSend->NotifyListenersOnStartCopy(listenerData);
|
||||
mComposeAndSend->NotifyListenersOnStartCopy();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
CopyListener::OnProgress(PRUint32 aProgress, PRUint32 aProgressMax, nsISupports *listenerData)
|
||||
CopyListener::OnProgress(PRUint32 aProgress, PRUint32 aProgressMax)
|
||||
{
|
||||
#ifdef NS_DEBUG
|
||||
printf("CopyListener::OnProgress() %d of %d\n", aProgress, aProgressMax);
|
||||
#endif
|
||||
|
||||
if (mComposeAndSend)
|
||||
mComposeAndSend->NotifyListenersOnProgressCopy(aProgress, aProgressMax, listenerData);
|
||||
mComposeAndSend->NotifyListenersOnProgressCopy(aProgress, aProgressMax);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
CopyListener::OnStopCopy(nsresult aStatus, nsISupports *listenerData)
|
||||
CopyListener::SetMessageKey(PRUint32 aMessageKey)
|
||||
{
|
||||
if (mComposeAndSend)
|
||||
mComposeAndSend->SetMessageKey(aMessageKey);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
CopyListener::GetMessageId(nsString2* aMessageId)
|
||||
{
|
||||
if (mComposeAndSend)
|
||||
mComposeAndSend->GetMessageId(aMessageId);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
CopyListener::OnStopCopy(nsresult aStatus)
|
||||
{
|
||||
if (NS_SUCCEEDED(aStatus))
|
||||
{
|
||||
|
|
@ -86,7 +102,7 @@ CopyListener::OnStopCopy(nsresult aStatus, nsISupports *listenerData)
|
|||
}
|
||||
|
||||
if (mComposeAndSend)
|
||||
mComposeAndSend->NotifyListenersOnStopCopy(aStatus, listenerData);
|
||||
mComposeAndSend->NotifyListenersOnStopCopy(aStatus);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -191,8 +207,8 @@ nsMsgCopy::DoCopy(nsIFileSpec *aDiskFile, nsIMsgFolder *dstFolder,
|
|||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
mCopyListener->SetMsgComposeAndSendObject(aMsgSendObj);
|
||||
rv = copyService->CopyFileMessage(aDiskFile, dstFolder, aMsgToReplace, aIsDraft,
|
||||
mCopyListener, nsnull, txnMgr);
|
||||
rv = copyService->CopyFileMessage(aDiskFile, dstFolder, aMsgToReplace,
|
||||
aIsDraft, mCopyListener, txnMgr);
|
||||
}
|
||||
|
||||
return rv;
|
||||
|
|
|
|||
|
|
@ -49,11 +49,15 @@ public:
|
|||
// nsISupports interface
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
NS_IMETHOD OnStartCopy(nsISupports *listenerData);
|
||||
NS_IMETHOD OnStartCopy();
|
||||
|
||||
NS_IMETHOD OnProgress(PRUint32 aProgress, PRUint32 aProgressMax, nsISupports *listenerData);
|
||||
NS_IMETHOD OnProgress(PRUint32 aProgress, PRUint32 aProgressMax);
|
||||
|
||||
NS_IMETHOD SetMessageKey(PRUint32 aMessageKey);
|
||||
|
||||
NS_IMETHOD OnStopCopy(nsresult aStatus, nsISupports *listenerData);
|
||||
NS_IMETHOD GetMessageId(nsString2* aMessageId);
|
||||
|
||||
NS_IMETHOD OnStopCopy(nsresult aStatus);
|
||||
|
||||
NS_IMETHOD SetMsgComposeAndSendObject(nsMsgComposeAndSend *obj);
|
||||
|
||||
|
|
|
|||
|
|
@ -1611,7 +1611,7 @@ nsMsgComposeAndSend::DoFcc()
|
|||
//
|
||||
char *eMsg = ComposeBEGetStringByID(rv);
|
||||
Fail(rv, eMsg);
|
||||
NotifyListenersOnStopCopy(rv, nsnull);
|
||||
NotifyListenersOnStopCopy(rv);
|
||||
PR_FREEIF(eMsg);
|
||||
}
|
||||
|
||||
|
|
@ -1665,8 +1665,9 @@ nsMsgComposeAndSend::Clear()
|
|||
if (aFileSpec.Valid())
|
||||
aFileSpec.Delete(PR_FALSE);
|
||||
|
||||
delete mCopyFileSpec;
|
||||
mCopyFileSpec = nsnull;
|
||||
// jt -- *don't* use delete someone may still holding the nsIFileSpec
|
||||
// pointer
|
||||
NS_IF_RELEASE(mCopyFileSpec);
|
||||
}
|
||||
|
||||
if (mTempFileSpec)
|
||||
|
|
@ -1737,7 +1738,8 @@ nsMsgComposeAndSend::Clear()
|
|||
DeleteListeners();
|
||||
}
|
||||
|
||||
nsMsgComposeAndSend::nsMsgComposeAndSend()
|
||||
nsMsgComposeAndSend::nsMsgComposeAndSend() :
|
||||
m_messageKey(0xffffffff)
|
||||
{
|
||||
mCompFields = nsnull; /* Where to send the message once it's done */
|
||||
mListenerArray = nsnull;
|
||||
|
|
@ -1924,7 +1926,7 @@ nsMsgComposeAndSend::NotifyListenersOnStopSending(const char *aMsgID, nsresult a
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsMsgComposeAndSend::NotifyListenersOnStartCopy(nsISupports *listenerData)
|
||||
nsMsgComposeAndSend::NotifyListenersOnStartCopy()
|
||||
{
|
||||
nsCOMPtr<nsIMsgCopyServiceListener> copyListener;
|
||||
|
||||
|
|
@ -1935,7 +1937,7 @@ nsMsgComposeAndSend::NotifyListenersOnStartCopy(nsISupports *listenerData)
|
|||
{
|
||||
copyListener = do_QueryInterface(mListenerArray[i]);
|
||||
if (copyListener)
|
||||
copyListener->OnStartCopy(listenerData);
|
||||
copyListener->OnStartCopy();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1943,8 +1945,8 @@ nsMsgComposeAndSend::NotifyListenersOnStartCopy(nsISupports *listenerData)
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsMsgComposeAndSend::NotifyListenersOnProgressCopy(PRUint32 aProgress, PRUint32 aProgressMax,
|
||||
nsISupports *listenerData)
|
||||
nsMsgComposeAndSend::NotifyListenersOnProgressCopy(PRUint32 aProgress,
|
||||
PRUint32 aProgressMax)
|
||||
{
|
||||
nsCOMPtr<nsIMsgCopyServiceListener> copyListener;
|
||||
|
||||
|
|
@ -1955,7 +1957,7 @@ nsMsgComposeAndSend::NotifyListenersOnProgressCopy(PRUint32 aProgress, PRUint32
|
|||
{
|
||||
copyListener = do_QueryInterface(mListenerArray[i]);
|
||||
if (copyListener)
|
||||
copyListener->OnProgress(aProgress, aProgressMax, listenerData);
|
||||
copyListener->OnProgress(aProgress, aProgressMax);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1963,7 +1965,25 @@ nsMsgComposeAndSend::NotifyListenersOnProgressCopy(PRUint32 aProgress, PRUint32
|
|||
}
|
||||
|
||||
nsresult
|
||||
nsMsgComposeAndSend::NotifyListenersOnStopCopy(nsresult aStatus, nsISupports *listenerData)
|
||||
nsMsgComposeAndSend::SetMessageKey(PRUint32 aMessageKey)
|
||||
{
|
||||
m_messageKey = aMessageKey;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsMsgComposeAndSend::GetMessageId(nsString2* aMessageId)
|
||||
{
|
||||
if (aMessageId && mCompFields)
|
||||
{
|
||||
*aMessageId = mCompFields->GetMessageId();
|
||||
return NS_OK;
|
||||
}
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsMsgComposeAndSend::NotifyListenersOnStopCopy(nsresult aStatus)
|
||||
{
|
||||
nsCOMPtr<nsIMsgCopyServiceListener> copyListener;
|
||||
|
||||
|
|
@ -1974,7 +1994,7 @@ nsMsgComposeAndSend::NotifyListenersOnStopCopy(nsresult aStatus, nsISupports *li
|
|||
{
|
||||
copyListener = do_QueryInterface(mListenerArray[i]);
|
||||
if (copyListener)
|
||||
copyListener->OnStopCopy(aStatus, listenerData);
|
||||
copyListener->OnStopCopy(aStatus);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2225,7 +2245,7 @@ nsMsgComposeAndSend::SendToMagicFolder(nsMsgDeliverMode mode)
|
|||
// RICHIE_TODO: message loss here
|
||||
char *eMsg = ComposeBEGetStringByID(rv);
|
||||
Fail(NS_ERROR_OUT_OF_MEMORY, eMsg);
|
||||
NotifyListenersOnStopCopy(rv, nsnull);
|
||||
NotifyListenersOnStopCopy(rv);
|
||||
PR_FREEIF(eMsg);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -259,9 +259,13 @@ public:
|
|||
|
||||
// If the listener has implemented the nsIMsgCopyServiceListener interface, I will drive it from
|
||||
// here
|
||||
NS_IMETHOD NotifyListenersOnStartCopy(nsISupports *listenerData);
|
||||
NS_IMETHOD NotifyListenersOnProgressCopy(PRUint32 aProgress, PRUint32 aProgressMax, nsISupports *listenerData);
|
||||
NS_IMETHOD NotifyListenersOnStopCopy(nsresult aStatus, nsISupports *listenerData);
|
||||
NS_IMETHOD NotifyListenersOnStartCopy();
|
||||
NS_IMETHOD NotifyListenersOnProgressCopy(PRUint32 aProgress, PRUint32 aProgressMax);
|
||||
NS_IMETHOD NotifyListenersOnStopCopy(nsresult aStatus);
|
||||
NS_IMETHOD SetMessageKey(PRUint32 aMessageKey);
|
||||
NS_IMETHOD GetMessageId(nsString2* aMessageId);
|
||||
|
||||
nsMsgKey m_messageKey; // jt -- Draft/Template support; newly created key
|
||||
|
||||
//
|
||||
// Attachment processing...
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче