Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

66676. r=racham, sr=bienvenu. Maintain the parent-child relationship when adding

Browse Source 
folders to trash.


git-svn-id: svn://10.0.0.236/trunk@87750 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
naving%netscape.com
2001-02-23 01:39:42 +00:00
parent 342ff352ea
commit 723bb2038a
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mozilla/mailnews/local/src/nsLocalMailFolder.cpp
View File

@@ -1112,7 +1112,18 @@ NS_IMETHODIMP nsMsgLocalMailFolder::DeleteSubFolders(
PRBool okToDelete = PR_FALSE;
dialog->Confirm(nsnull, alertString, &okToDelete);
if (okToDelete)
return nsMsgFolder::DeleteSubFolders(folders, msgWindow);
{
nsCOMPtr<nsIMsgFolder> trashFolder;
rv = GetTrashFolder(getter_AddRefs(trashFolder));
if (NS_SUCCEEDED(rv))
{
// we don't allow multiple folder selection so this is ok.
nsCOMPtr<nsISupports> supports = getter_AddRefs(folders->ElementAt(0));
nsCOMPtr<nsIMsgFolder> folder = do_QueryInterface(supports);
if (folder)
trashFolder->CopyFolder(folder, PR_TRUE, msgWindow, nsnull);
}
}
}
}
return rv;