Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

74937 r=cavin sr=bienvenu fixing no alert when d&d local folders to trash

Browse Source
This commit is contained in:
naving%netscape.com 2002-08-08 20:03:23 +00:00
parent 5d4cc7c30c
commit 4398da6e5e
2 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1133,45 +1133,51 @@ NS_IMETHODIMP nsMsgLocalMailFolder::DeleteSubFolders(
return nsMsgFolder::DeleteSubFolders(folders, msgWindow); return nsMsgFolder::DeleteSubFolders(folders, msgWindow);
} }
if (!msgWindow)
return NS_ERROR_NULL_POINTER;
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;
}
nsresult nsMsgLocalMailFolder::ConfirmFolderDeletion(nsIMsgWindow *aMsgWindow, PRBool *aResult)
{
NS_ENSURE_ARG(aResult);
NS_ENSURE_ARG(aMsgWindow);
nsCOMPtr<nsIDocShell> docShell; nsCOMPtr<nsIDocShell> docShell;
if (!msgWindow) return NS_ERROR_NULL_POINTER; aMsgWindow->GetRootDocShell(getter_AddRefs(docShell));
msgWindow->GetRootDocShell(getter_AddRefs(docShell));
if (docShell) if (docShell)
{ {
PRBool okToDelete = PR_FALSE;
PRBool confirmDeletion = PR_TRUE; PRBool confirmDeletion = PR_TRUE;
nsresult rv;
nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv)); nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv)) if (NS_SUCCEEDED(rv))
rv = prefs->GetBoolPref("mailnews.confirm.moveFoldersToTrash", &confirmDeletion); prefs->GetBoolPref("mailnews.confirm.moveFoldersToTrash", &confirmDeletion);
if (confirmDeletion) if (confirmDeletion)
{ {
if (!mMsgStringService) if (!mMsgStringService)
mMsgStringService = do_GetService(NS_MSG_POPSTRINGSERVICE_CONTRACTID); mMsgStringService = do_GetService(NS_MSG_POPSTRINGSERVICE_CONTRACTID);
if (!mMsgStringService) return NS_ERROR_FAILURE; if (!mMsgStringService)
PRUnichar *alertString = nsnull; return NS_ERROR_FAILURE;
mMsgStringService->GetStringByID(POP3_MOVE_FOLDER_TO_TRASH, &alertString); nsXPIDLString alertString;
if (!alertString) return rv; mMsgStringService->GetStringByID(POP3_MOVE_FOLDER_TO_TRASH, getter_Copies(alertString));
nsCOMPtr<nsIPrompt> dialog(do_GetInterface(docShell)); nsCOMPtr<nsIPrompt> dialog(do_GetInterface(docShell));
if (dialog) if (dialog)
dialog->Confirm(nsnull, alertString, &okToDelete); dialog->Confirm(nsnull, alertString.get(), aResult);
} }
else else
okToDelete = PR_TRUE; *aResult = PR_TRUE;
if (okToDelete)
{
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; return NS_OK;
} }
NS_IMETHODIMP nsMsgLocalMailFolder::Rename(const PRUnichar *aNewName, nsIMsgWindow *msgWindow) NS_IMETHODIMP nsMsgLocalMailFolder::Rename(const PRUnichar *aNewName, nsIMsgWindow *msgWindow)
@ -1978,15 +1984,24 @@ nsMsgLocalMailFolder::CopyFolderLocal(nsIMsgFolder *srcFolder, PRBool isMoveFold
nsCOMPtr<nsIMsgFolder> newMsgFolder; nsCOMPtr<nsIMsgFolder> newMsgFolder;
PRBool isChildOfTrash=PR_FALSE; PRBool isChildOfTrash=PR_FALSE;
rv = IsChildOfTrash(&isChildOfTrash); rv = IsChildOfTrash(&isChildOfTrash);
if (isChildOfTrash) if (isChildOfTrash)
{ {
if (isMoveFolder) //do it just for the parent folder (isMoveFolder is true for parent only) if we are deleting/moving a folder tree
{
PRBool okToDelete = PR_FALSE;
ConfirmFolderDeletion(msgWindow, &okToDelete);
if (!okToDelete)
return NS_MSG_ERROR_COPY_FOLDER_ABORTED;
}
PRBool match = PR_FALSE; PRBool match = PR_FALSE;
PRBool confirmed = PR_FALSE;
rv = srcFolder->MatchOrChangeFilterDestination(nsnull, PR_FALSE, &match); rv = srcFolder->MatchOrChangeFilterDestination(nsnull, PR_FALSE, &match);
if (match) if (match)
{ {
PRBool confirmed = PR_FALSE;
srcFolder->ConfirmFolderDeletionForFilter(msgWindow, &confirmed); srcFolder->ConfirmFolderDeletionForFilter(msgWindow, &confirmed);
if (!confirmed) return NS_MSG_ERROR_COPY_FOLDER_ABORTED; if (!confirmed)
return NS_MSG_ERROR_COPY_FOLDER_ABORTED;
} }
} }

1
mailnews/local/src/nsLocalMailFolder.h
View File

@ -180,6 +180,7 @@ protected:
nsresult WriteStartOfNewMessage(); nsresult WriteStartOfNewMessage();
nsresult IsChildOfTrash(PRBool *result); nsresult IsChildOfTrash(PRBool *result);
nsresult RecursiveSetDeleteIsMoveTrash(PRBool bVal); nsresult RecursiveSetDeleteIsMoveTrash(PRBool bVal);
nsresult ConfirmFolderDeletion(nsIMsgWindow *aMsgWindow, PRBool *aResult);
nsresult CheckIfFolderExists(const PRUnichar *folderName, nsFileSpec &path, nsIMsgWindow *msgWindow); nsresult CheckIfFolderExists(const PRUnichar *folderName, nsFileSpec &path, nsIMsgWindow *msgWindow);