134291 r=mscott sr=bienvenu Make migration for 2nd profile having imap accts work. The fix is to make imapHostSessionList listen for profile-before-change topic and reset all the host (resetAll).

mailnews/imap/build/nsImapFactory.cpp

@@ -53,7 +53,7 @@
 // private factory declarations for each component we know how to produce
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsImapUrl, Initialize)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapProtocol)
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsIMAPHostSessionList)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsIMAPHostSessionList, Init)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapIncomingServer)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapService)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMailFolder)

mailnews/imap/src/nsIMAPHostSessionList.cpp

@@ -44,6 +44,7 @@
 #include "nsIImapIncomingServer.h"
 #include "nsCOMPtr.h"
 #include "nsIMsgIncomingServer.h"
+#include "nsIObserverService.h"
 
 nsIMAPHostInfo::nsIMAPHostInfo(const char *serverKey, 
                                nsIImapIncomingServer *server)
@@ -85,39 +86,10 @@ nsIMAPHostInfo::~nsIMAPHostInfo()
 	delete fShellCache;
 }
 
-/* the following macros actually implement addref, release and query interface for our component. */
-NS_IMPL_THREADSAFE_ADDREF(nsIMAPHostSessionList)
-NS_IMPL_THREADSAFE_RELEASE(nsIMAPHostSessionList)
-
-NS_IMETHODIMP nsIMAPHostSessionList::QueryInterface(const nsIID &aIID, void** aInstancePtr)
-{                                                                        
-  if (NULL == aInstancePtr)
-    return NS_ERROR_NULL_POINTER;
-        
-  *aInstancePtr = NULL;
-                                                                         
-  static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); 
-  static NS_DEFINE_IID(kIsThreadsafeIID, NS_ISTHREADSAFE_IID); 
-
-  if (aIID.Equals(NS_GET_IID(nsIImapHostSessionList)))
-  {
-	  *aInstancePtr = (nsIImapHostSessionList *) this;
-	  NS_ADDREF_THIS();
-	  return NS_OK;
-  }
-  if (aIID.Equals(kISupportsIID)) 
-  {
-	  *aInstancePtr = (void*) ((nsISupports*)this);
-	  NS_ADDREF_THIS();
-    return NS_OK;                                                        
-  }                                                                      
-  
-  if (aIID.Equals(kIsThreadsafeIID)) 
-  {
-    return NS_OK;
-  }
-  return NS_NOINTERFACE;
-}
+NS_IMPL_THREADSAFE_ISUPPORTS3(nsIMAPHostSessionList,
+                              nsIImapHostSessionList,
+                              nsIObserver,
+                              nsISupportsWeakReference)
 
 
 nsIMAPHostSessionList::nsIMAPHostSessionList()
@@ -133,6 +105,36 @@ nsIMAPHostSessionList::~nsIMAPHostSessionList()
 	PR_DestroyMonitor(gCachedHostInfoMonitor);
 }
 
+nsresult nsIMAPHostSessionList::Init()
+{
+  nsresult rv;
+  nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv);
+  if (NS_SUCCEEDED(rv))
+  {
+    observerService->AddObserver(this, "profile-before-change", PR_TRUE);
+    observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, PR_TRUE);
+  }
+  return rv;
+}
+
+
+NS_IMETHODIMP nsIMAPHostSessionList::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData)
+{
+  nsresult rv;  
+  if (!strcmp(aTopic, "profile-before-change")) 
+    ResetAll();
+  else if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID))
+  {
+    nsCOMPtr<nsIObserverService> observerService =  do_GetService("@mozilla.org/observer-service;1", &rv);
+    if (NS_SUCCEEDED(rv))
+    {    
+      observerService->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
+      observerService->RemoveObserver(this, "profile-before-change");
+    }
+  }
+  return NS_OK;
+}
+
 nsIMAPHostInfo *nsIMAPHostSessionList::FindHost(const char *serverKey)
 {
 	nsIMAPHostInfo *host;

mailnews/imap/src/nsIMAPHostSessionList.h

@@ -40,6 +40,8 @@
 
 #include "nsImapCore.h"
 #include "nsIIMAPHostSessionList.h"
+#include "nsIObserver.h"
+#include "nsWeakReference.h"
 #include "nspr.h"
 
 class nsIMAPNamespaceList;
@@ -75,14 +77,16 @@ protected:
 };
 
 // this is an interface to a linked list of host info's    
-class nsIMAPHostSessionList : public nsIImapHostSessionList
+class nsIMAPHostSessionList : public nsIImapHostSessionList, public nsIObserver, public nsSupportsWeakReference
 {
 public:
 
 	NS_DECL_ISUPPORTS
+  NS_DECL_NSIOBSERVER  
 
 	nsIMAPHostSessionList();
 	virtual ~nsIMAPHostSessionList();
+  nsresult Init();
 	// Host List
 	 NS_IMETHOD	AddHostToList(const char *serverKey, 
                               nsIImapIncomingServer *server);