Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-09 08:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix problems copying empty imap or local folder to another local folder only works once, patch by cavin@netscape.com, r=sspitzer, sr=bienvenu

Browse Source
This commit is contained in:
bienvenu%netscape.com 2003-07-14 23:36:22 +00:00
parent e63dfa4919
commit 4291a8a577
2 changed files with 100 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
mailnews/base/src/nsMsgCopyService.cpp
View File

@ -204,7 +204,18 @@ nsMsgCopyService::QueueRequest(nsCopyRequest* aRequest, PRBool *aCopyImmediately
for (i=0; i < cnt; i++)
{
copyRequest = (nsCopyRequest*) m_copyRequests.ElementAt(i);
if (copyRequest->m_dstFolder.get() == aRequest->m_dstFolder.get()) //if dst are same and we already have a request, we cannot copy immediately
if (aRequest->m_requestType == nsCopyFoldersType)
{
// For copy folder, see if both destination folder (root)
// (ie, Local Folder) and folder name (ie, abc) are the same.
if (copyRequest->m_dstFolderName == aRequest->m_dstFolderName &&
copyRequest->m_dstFolder.get() == aRequest->m_dstFolder.get())
{
*aCopyImmediately = PR_FALSE;
break;
}
}
else if (copyRequest->m_dstFolder.get() == aRequest->m_dstFolder.get()) //if dst are same and we already have a request, we cannot copy immediately
{
*aCopyImmediately = PR_FALSE;
break;
@ -308,6 +319,13 @@ nsMsgCopyService::DoNextCopy()
}
}
// Don't clear copy request in failure case - notify completion should do that.
// Hmm, this is not true in case it's a copy folder opeation and the destination
// folder already exists. In this case CopyFolder() returns an error and there
// won't be completion notification at all and the request will stay in the
// queue forever.
if (NS_FAILED(rv))
ClearRequest(copyRequest, rv);
return rv;
}
@ -326,19 +344,34 @@ nsMsgCopyService::FindRequest(nsISupports* aSupport,
{
// If the src is different then check next request.
if (copyRequest->m_srcSupport.get() != aSupport)
{
copyRequest = nsnull;
continue;
}
// See if the parent of the copied folder is the same as the one when the request was made.
// Note if the destination folder is already a server folder then no need to get parent.
nsCOMPtr <nsIMsgFolder> parentMsgFolder;
nsresult rv = dstFolder->GetParentMsgFolder(getter_AddRefs(parentMsgFolder));
if ((NS_FAILED(rv)) || !parentMsgFolder || (copyRequest->m_dstFolder.get() != parentMsgFolder))
nsresult rv = NS_OK;
PRBool isServer=PR_FALSE;
dstFolder->GetIsServer(&isServer);
if (isServer)
rv = dstFolder->GetParentMsgFolder(getter_AddRefs(parentMsgFolder));
if ((NS_FAILED(rv)) || (!parentMsgFolder && !isServer) || (copyRequest->m_dstFolder.get() != parentMsgFolder))
{
copyRequest = nsnull;
continue;
}
// Now checks if the folder name is the same.
nsXPIDLString folderName;
rv = dstFolder->GetName(getter_Copies(folderName));
if (NS_FAILED(rv))
{
copyRequest = nsnull;
continue;
}
if (copyRequest->m_dstFolderName == folderName)
break;
}
@ -578,12 +611,3 @@ nsMsgCopyService::NotifyCompletion(nsISupports* aSupport,
return rv;
}
nsresult
NS_NewMsgCopyService(const nsIID& iid, void **result)
{
nsMsgCopyService* copyService;
if (!result) return NS_ERROR_NULL_POINTER;
copyService = new nsMsgCopyService();
if (!copyService) return NS_ERROR_OUT_OF_MEMORY;
return copyService->QueryInterface(iid, result);
}

6
mailnews/local/src/nsLocalMailFolder.cpp
View File

@ -2014,6 +2014,12 @@ nsMsgLocalMailFolder::CopyFolderAcrossServer(nsIMsgFolder* srcFolder, nsIMsgWind
nsCOMPtr <nsIMsgLocalMailFolder> localFolder = do_QueryInterface(newMsgFolder);
if (localFolder)
localFolder->DoNextSubFolder(srcFolder, msgWindow, listener);
// We need to call OnCopyCompleted() here because if it's an empty folder then
// we'll never get a callback to nsMailboxProtocol::OnStopRequest() which will
// eventually call OnCopyCompleted() to clean up the copy request.
nsCOMPtr<nsISupports> srcSupport = do_QueryInterface(srcFolder);
return OnCopyCompleted(srcSupport, PR_FALSE);
}
return NS_OK; // otherwise the front-end will say Exception::CopyFolder
}