From 91eea36d2ccdd3444d7c7a29bae54dbc403a1f63 Mon Sep 17 00:00:00 2001 From: "naving%netscape.com" Date: Mon, 12 Feb 2001 21:38:48 +0000 Subject: [PATCH] 63866. sr=sspitzer, bienvenu. Get Subfolders for 'trash' and not 'this' git-svn-id: svn://10.0.0.236/trunk@86839 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/local/src/nsLocalMailFolder.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index 84de89016df..230af1d0a5f 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -898,11 +898,15 @@ NS_IMETHODIMP nsMsgLocalMailFolder::EmptyTrash(nsIMsgWindow *msgWindow, trashFolder->RecursiveSetDeleteIsMoveToTrash(PR_FALSE); PRInt32 totalMessages = 0; rv = trashFolder->GetTotalMessages(PR_TRUE, &totalMessages); - PRUint32 cnt = 0; - if (mSubFolders) - mSubFolders->Count(&cnt); - - if (totalMessages <= 0 && cnt == 0 ) return NS_OK; + + if (totalMessages <= 0) + { + nsCOMPtr aEnumerator; + rv =trashFolder->GetSubFolders(getter_AddRefs(aEnumerator)); + NS_ENSURE_SUCCESS(rv,rv); + rv = aEnumerator->First(); //will fail if no subfolders + if (NS_FAILED(rv)) return NS_OK; + } nsCOMPtr parent; rv = trashFolder->GetParent(getter_AddRefs(parent)); @@ -3013,3 +3017,5 @@ nsMsgLocalMailFolder::setSubfolderFlag(PRUnichar* aFolderName, return NS_OK; } + +