remove static cid.

mailnews/base/src/nsMsgOfflineManager.cpp

@@ -55,7 +55,6 @@
 #include "nsINntpService.h"
 #include "nsXPIDLString.h"
 
-static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID);
 static NS_DEFINE_CID(kMsgSendLaterCID, NS_MSGSENDLATER_CID); 
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 
@@ -200,7 +199,7 @@ nsresult nsMsgOfflineManager::AdvanceToNextState(nsresult exitStatus)
 nsresult nsMsgOfflineManager::SynchronizeOfflineImapChanges()
 {
   nsresult rv = NS_OK;
-	nsCOMPtr<nsIImapService> imapService(do_GetService(kCImapService, &rv));
+	nsCOMPtr<nsIImapService> imapService = do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   return imapService->PlaybackAllOfflineOperations(m_window, this, getter_AddRefs(mOfflineImapSync));
 }
@@ -313,7 +312,7 @@ nsresult nsMsgOfflineManager::DownloadMail()
 {
   nsresult rv = NS_OK;
   ShowStatus("downloadingMail");
-	nsCOMPtr<nsIImapService> imapService(do_GetService(kCImapService, &rv));
+	nsCOMPtr<nsIImapService> imapService = do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
   return imapService->DownloadAllOffineImapFolders(m_window, this);
   // ### we should do get new mail on pop servers, and download imap messages for offline use.

mailnews/local/src/nsLocalUndoTxn.cpp

@@ -47,7 +47,6 @@
 #include "nsIEventQueueService.h"
 
 static NS_DEFINE_CID(kMailboxServiceCID, NS_IMAILBOXSERVICE_IID);
-static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
 
 nsLocalMoveCopyMsgTxn::nsLocalMoveCopyMsgTxn() :
@@ -166,7 +165,7 @@ nsLocalMoveCopyMsgTxn::UndoImapDeleteFlag(nsIMsgFolder* folder,
     if (m_srcIsImap4)
     {
         nsCOMPtr<nsIImapService> imapService = 
-                 do_GetService(kCImapService, &rv);
+                 do_GetService(NS_IMAPSERVICE_CONTRACTID, &rv);
         if (NS_SUCCEEDED(rv))
         {
             nsCOMPtr<nsIUrlListener> urlListener;