From e702f1953941deaef7e009b74f2da0a7663eeddb Mon Sep 17 00:00:00 2001 From: "bienvenu%netscape.com" Date: Mon, 9 Dec 2002 17:41:50 +0000 Subject: [PATCH] fix for failure deleting in/moving multiple message to local folders 182808 r=dmose, sr=bzbarsky a=asa git-svn-id: svn://10.0.0.236/trunk@134978 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/local/src/nsLocalMailFolder.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index 8ac567ecb4b..a5223e6e4df 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -1879,6 +1879,11 @@ nsMsgLocalMailFolder::CopyMessages(nsIMsgFolder* srcFolder, nsISupportsArray* { mCopyState->m_copyingMultipleMessages = PR_TRUE; rv = CopyMessagesTo(mCopyState->m_messages, msgWindow, this, isMove); + if (NS_FAILED(rv)) + { + NS_ERROR("copy message failed"); + (void) OnCopyCompleted(srcSupport, PR_FALSE); + } } else { @@ -2790,7 +2795,7 @@ nsresult nsMsgLocalMailFolder::CopyMessagesTo(nsISupportsArray *messages, nsresult rv; - nsCOMPtr copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID); + nsCOMPtr copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv,rv); nsCOMPtr copyListener(do_QueryInterface(dstFolder)); @@ -2873,7 +2878,7 @@ nsresult nsMsgLocalMailFolder::CopyMessageTo(nsISupports *message, nsXPIDLCString uri; srcFolder->GetUriForMsg(msgHdr, getter_Copies(uri)); - nsCOMPtr copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID); + nsCOMPtr copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv,rv); nsCOMPtr copyListener(do_QueryInterface(dstFolder));