From bf86951e608a7333d34f4f95c20e743f8da62b5a Mon Sep 17 00:00:00 2001 From: "naving%netscape.com" Date: Wed, 11 Sep 2002 01:54:13 +0000 Subject: [PATCH] 167560 r=cavin sr=bienvenu make remaining cases of copyMessages go through copy service git-svn-id: svn://10.0.0.236/trunk@129192 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/base/src/nsMsgDBView.cpp | 6 +++++- mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp | 9 ++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp index 25b2e9e3e09..64e89274d73 100644 --- a/mozilla/mailnews/base/src/nsMsgDBView.cpp +++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp @@ -61,6 +61,8 @@ #include "nsIPrefBranchInternal.h" #include "nsIPrefLocalizedString.h" #include "nsIMsgSearchSession.h" +#include "nsIMsgCopyService.h" +#include "nsMsgBaseCID.h" /* Implementation file */ static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); @@ -1977,7 +1979,9 @@ nsMsgDBView::CopyMessages(nsIMsgWindow *window, nsMsgViewIndex *indices, PRInt32 messageArray->AppendElement(msgHdr); } m_deletingRows = isMove && mDeleteModel != nsMsgImapDeleteModels::IMAPDelete; - rv = destFolder->CopyMessages(m_folder /* source folder */, messageArray, isMove, window, nsnull /* listener */, PR_FALSE /* isFolder */, PR_TRUE /*allowUndo*/); + nsCOMPtr copyService = do_GetService(NS_MSGCOPYSERVICE_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + rv = copyService->CopyMessages(m_folder /* source folder */, messageArray, destFolder, isMove, nsnull /* listener */, window, PR_TRUE /*allowUndo*/); return rv; } diff --git a/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp b/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp index 732322c29ea..c99148d4b18 100644 --- a/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp +++ b/mozilla/mailnews/imap/src/nsImapMoveCoalescer.cpp @@ -41,6 +41,8 @@ #include "nsImapMoveCoalescer.h" #include "nsMsgKeyArray.h" #include "nsImapService.h" +#include "nsIMsgCopyService.h" +#include "nsMsgBaseCID.h" #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later... static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID); @@ -149,9 +151,10 @@ nsresult nsImapMoveCoalescer::PlaybackMoves(nsIEventQueue *eventQueue) messages->AppendElement(iSupports); } } - rv = destFolder->CopyMessages(m_sourceFolder, - messages, PR_TRUE, m_msgWindow, - /*nsIMsgCopyServiceListener* listener*/ nsnull, PR_FALSE, PR_FALSE /*allowUndo*/); + nsCOMPtr copySvc = do_GetService(NS_MSGCOPYSERVICE_CONTRACTID); + if (copySvc) + rv = copySvc->CopyMessages(m_sourceFolder, messages, destFolder, PR_TRUE, + /*nsIMsgCopyServiceListener* listener*/ nsnull, m_msgWindow, PR_FALSE /*allowUndo*/); // rv = imapService->OnlineMessageCopy(eventQueue, // m_sourceFolder, messageIds.get(), // destFolder, PR_TRUE, PR_TRUE,