зеркало из https://github.com/mozilla/gecko-dev.git
fix for failure deleting in/moving multiple message to local folders 182808 r=dmose, sr=bzbarsky a=asa
This commit is contained in:
Родитель
385b4ee0e2
Коммит
013d962b41
|
@ -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<nsICopyMessageStreamListener> copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID);
|
||||
nsCOMPtr<nsICopyMessageStreamListener> copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID, &rv);
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
|
||||
nsCOMPtr<nsICopyMessageListener> copyListener(do_QueryInterface(dstFolder));
|
||||
|
@ -2873,7 +2878,7 @@ nsresult nsMsgLocalMailFolder::CopyMessageTo(nsISupports *message,
|
|||
nsXPIDLCString uri;
|
||||
srcFolder->GetUriForMsg(msgHdr, getter_Copies(uri));
|
||||
|
||||
nsCOMPtr<nsICopyMessageStreamListener> copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID);
|
||||
nsCOMPtr<nsICopyMessageStreamListener> copyStreamListener = do_CreateInstance(NS_COPYMESSAGESTREAMLISTENER_CONTRACTID, &rv);
|
||||
NS_ENSURE_SUCCESS(rv,rv);
|
||||
|
||||
nsCOMPtr<nsICopyMessageListener> copyListener(do_QueryInterface(dstFolder));
|
||||
|
|
Загрузка…
Ссылка в новой задаче