From 4ff8f140362e8126a0931fbb1f96e949fc0c4836 Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Thu, 11 Nov 2004 18:59:20 +0000 Subject: [PATCH] fix compact all folders when summary file out of date, sr=mscott 268954 git-svn-id: svn://10.0.0.236/trunk@165266 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/local/src/nsLocalMailFolder.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index e418ea31ee2..63116e5cab3 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -331,8 +331,11 @@ NS_IMETHODIMP nsMsgLocalMailFolder::ParseFolder(nsIMsgWindow *aMsgWindow, nsIUrl NS_ASSERTION(PR_FALSE, "Could not get folder lock"); return NS_MSG_FOLDER_BUSY; } - - rv = mailboxService->ParseMailbox(aMsgWindow, path, parser, listener, nsnull); + + if (listener != this) + mReparseListener = listener; + + rv = mailboxService->ParseMailbox(aMsgWindow, path, parser, this, nsnull); if (NS_SUCCEEDED(rv)) m_parsingFolder = PR_TRUE; return rv; @@ -575,7 +578,7 @@ NS_IMETHODIMP nsMsgLocalMailFolder::GetDatabaseWithReparse(nsIUrlListener *aRepa if(folderOpen == NS_MSG_ERROR_FOLDER_SUMMARY_MISSING || folderOpen == NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE) { - if(NS_FAILED(rv = ParseFolder(aMsgWindow, (aReparseUrlListener) ? aReparseUrlListener : this))) + if(NS_FAILED(rv = ParseFolder(aMsgWindow, aReparseUrlListener))) { if (rv == NS_MSG_FOLDER_BUSY) {