fixing compact folder bugs 173357 173399 70322

git-svn-id: svn://10.0.0.236/branches/ISHMAIL_1_0_BRANCH@132425 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
naving%netscape.com
2002-10-24 01:27:04 +00:00
parent 44c7c0ef23
commit 922b945eb6

View File

@@ -264,6 +264,7 @@ nsFolderCompactState::Init(nsIMsgFolder *folder, const char *baseMsgUri, nsIMsgD
pathSpec->GetFileSpec(&m_fileSpec);
m_fileSpec.SetLeafName("nstmp");
m_fileSpec.MakeUnique(); //make sure we are not crunching existing nstmp file
m_window = aMsgWindow;
m_keyArray.RemoveAll();
InitDB(db);
@@ -328,13 +329,11 @@ nsresult nsFolderCompactState::StartCompacting()
{
m_folder->NotifyCompactCompleted();
m_folder->ThrowAlertMsg("compactFolderDeniedLock", m_window);
CleanupTempFilesAfterError();
if (m_compactAll)
CompactNextFolder();
return CompactNextFolder();
else
{
CleanupTempFilesAfterError();
return rv;
}
}
if (m_size > 0)
{