fix the mac and linux bustage

mailnews/base/util/nsMsgDBFolder.cpp

@@ -60,6 +60,7 @@ static PRTime gtimeOfLastPurgeCheck = 0;    //variable to know when to check for
 nsIAtom* nsMsgDBFolder::mFolderLoadedAtom=nsnull;
 nsIAtom* nsMsgDBFolder::mDeleteOrMoveMsgCompletedAtom=nsnull;
 nsIAtom* nsMsgDBFolder::mDeleteOrMoveMsgFailedAtom=nsnull;
+nsIAtom* nsMsgDBFolder::mCompactCompletedAtom=nsnull;
 nsrefcnt nsMsgDBFolder::mInstanceCount=0;
 
 NS_IMPL_ISUPPORTS_INHERITED2(nsMsgDBFolder, nsMsgFolder,
@@ -74,6 +75,7 @@ nsMsgDBFolder::nsMsgDBFolder(void)
     mFolderLoadedAtom = NS_NewAtom("FolderLoaded");
     mDeleteOrMoveMsgCompletedAtom = NS_NewAtom("DeleteOrMoveMsgCompleted");
     mDeleteOrMoveMsgFailedAtom = NS_NewAtom("DeleteOrMoveMsgFailed");
+    mCompactCompletedAtom = NS_NewAtom("CompactCompleted");
   }
 }
 
@@ -83,6 +85,7 @@ nsMsgDBFolder::~nsMsgDBFolder(void)
     NS_IF_RELEASE(mFolderLoadedAtom);
     NS_IF_RELEASE(mDeleteOrMoveMsgCompletedAtom);
     NS_IF_RELEASE(mDeleteOrMoveMsgFailedAtom);
+    NS_IF_RELEASE(mCompactCompletedAtom);
   }
 	//shutdown but don't shutdown children.
 	Shutdown(PR_FALSE);

mailnews/base/util/nsMsgDBFolder.h

@@ -144,7 +144,7 @@ protected:
   static nsIAtom* mFolderLoadedAtom;
   static nsIAtom* mDeleteOrMoveMsgCompletedAtom;
   static nsIAtom* mDeleteOrMoveMsgFailedAtom;
-
+  static nsIAtom* mCompactCompletedAtom;
 private:
   static nsrefcnt mInstanceCount;
 };

mailnews/local/src/nsLocalMailFolder.cpp

@@ -103,7 +103,7 @@ extern char* ReadPopData(const char *hostname, const char* username, nsIFileSpec
 extern void SavePopData(char *data, nsIFileSpec* maildirectory);
 extern void net_pop3_delete_if_in_server(char *data, char *uidl, PRBool *changed);
 extern void KillPopData(char* data);
-nsIAtom* nsMsgLocalMailFolder::mCompactCompletedAtom=nsnull;
+
 //////////////////////////////////////////////////////////////////////////////
 // nsLocal
 /////////////////////////////////////////////////////////////////////////////
@@ -144,19 +144,11 @@ nsMsgLocalMailFolder::nsMsgLocalMailFolder(void)
     mCheckForNewMessagesAfterParsing(PR_FALSE), mParsingInbox(PR_FALSE)
 
 {
-  if (nsMsgDBFolder::mInstanceCount == 1)
-  {
-    mCompactCompletedAtom = NS_NewAtom("CompactCompleted");
-  }
 //  NS_INIT_REFCNT(); done by superclass
 }
 
 nsMsgLocalMailFolder::~nsMsgLocalMailFolder(void)
 {
-  if (nsMsgDBFolder::mInstanceCount ==1)
-  {
-    NS_IF_RELEASE(mCompactCompletedAtom);
-}
 }
 
 NS_IMPL_ADDREF_INHERITED(nsMsgLocalMailFolder, nsMsgFolder)

mailnews/local/src/nsLocalMailFolder.h

@@ -211,7 +211,6 @@ protected:
 
   nsresult setSubfolderFlag(PRUnichar *aFolderName, PRUint32 flags);
   nsresult DeleteMsgsOnPop3Server(nsISupportsArray *messages);
-  static nsIAtom* mCompactCompletedAtom;
 };
 
 #endif // nsMsgLocalMailFolder_h__