Restore deleted by prior broken putback opensolaris-2009-06 OSOL0906_U03B01a
authoradampaul
Wed, 15 Jul 2009 22:48:08 +0000
branchopensolaris-2009-06
changeset 14319 4976e1fc955b
parent 14318 fa65895eb632
child 14320 0ba5be995533
Restore deleted by prior broken putback
patches/thunderbird-22-mailfolder.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/thunderbird-22-mailfolder.diff	Wed Jul 15 22:48:08 2009 +0000
@@ -0,0 +1,27 @@
+diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp
+--- a/mailnews/base/src/nsMsgFolderCompactor.cpp
++++ b/mailnews/base/src/nsMsgFolderCompactor.cpp
+@@ -327,17 +327,23 @@ NS_IMETHODIMP nsFolderCompactState::OnSt
+   {
+     m_parsingFolder=PR_FALSE;
+     if (NS_SUCCEEDED(status))
+       status=Compact(m_folder, m_compactingOfflineFolders, m_window);
+     else if (m_compactAll)
+       CompactNextFolder();
+   }
+   else if (m_compactAll) // this should be the imap case only
++  {
++    nsCOMPtr <nsIMsgFolder> prevFolder = do_QueryElementAt(m_folderArray,
++                                                           m_folderIndex);
++    if (prevFolder)
++      prevFolder->SetMsgDatabase(nsnull);
+     CompactNextFolder();
++  }
+   return NS_OK;
+ }
+ 
+ nsresult nsFolderCompactState::StartCompacting()
+ {
+   nsresult rv = NS_OK;
+   if (m_size > 0)
+   {