rename the IDL attributes so it's more friendly to javascript, and use the new GetLocalPath method when upgrading mail.directory on POP

mailnews/base/public/nsIMsgAccountManager.h

@@ -51,11 +51,11 @@ class nsIMsgAccountManager : public nsISupports {
   /* string getAccountKey (in nsIMsgAccount account); */
   NS_IMETHOD getAccountKey(nsIMsgAccount *account, char **_retval) = 0;
 
-  /* nsISupportsArray getAllIdentities (); */
-  NS_IMETHOD getAllIdentities(nsISupportsArray **_retval) = 0;
+  /* readonly attribute nsISupportsArray allIdentities; */
+  NS_IMETHOD GetAllIdentities(nsISupportsArray * *aAllIdentities) = 0;
 
-  /* nsISupportsArray getAllServers (); */
-  NS_IMETHOD getAllServers(nsISupportsArray **_retval) = 0;
+  /* readonly attribute nsISupportsArray allServers; */
+  NS_IMETHOD GetAllServers(nsISupportsArray * *aAllServers) = 0;
 
   /* void LoadAccounts (); */
   NS_IMETHOD LoadAccounts() = 0;

mailnews/base/public/nsIMsgAccountManager.idl

@@ -49,8 +49,8 @@ interface nsIMsgAccountManager : nsISupports {
   string getAccountKey(in nsIMsgAccount account);
 
   /* utility routines to enumerate elements in all accounts */
-  nsISupportsArray getAllIdentities();
-  nsISupportsArray getAllServers();
+  readonly attribute nsISupportsArray allIdentities;
+  readonly attribute nsISupportsArray allServers;
 
   void LoadAccounts();
 };

mailnews/base/src/nsMsgAccountManager.cpp

@@ -76,11 +76,11 @@ public:
   /* string getAccountKey (in nsIMsgAccount account); */
   NS_IMETHOD getAccountKey(nsIMsgAccount *account, char **_retval) ;
 
-  /* nsISupportsArray getAllIdentities (); */
-  NS_IMETHOD getAllIdentities(nsISupportsArray **_retval) ;
+  /* nsISupportsArray GetAllIdentities (); */
+  NS_IMETHOD GetAllIdentities(nsISupportsArray **_retval) ;
 
-  /* nsISupportsArray getAllServers (); */
-  NS_IMETHOD getAllServers(nsISupportsArray **_retval) ;
+  /* nsISupportsArray GetAllServers (); */
+  NS_IMETHOD GetAllServers(nsISupportsArray **_retval) ;
 
   NS_IMETHOD LoadAccounts();
 
@@ -337,9 +337,9 @@ nsMsgAccountManager::addServerToArray(nsHashKey *key, void *aData,
   return PR_TRUE;
 }
 
-/* nsISupportsArray getAllIdentities (); */
+/* nsISupportsArray GetAllIdentities (); */
 NS_IMETHODIMP
-nsMsgAccountManager::getAllIdentities(nsISupportsArray **_retval)
+nsMsgAccountManager::GetAllIdentities(nsISupportsArray **_retval)
 {
   nsresult rv;
   nsISupportsArray *identities;
@@ -355,9 +355,9 @@ nsMsgAccountManager::getAllIdentities(nsISupportsArray **_retval)
   return rv;
 }
 
-/* nsISupportsArray getAllServers (); */
+/* nsISupportsArray GetAllServers (); */
 NS_IMETHODIMP
-nsMsgAccountManager::getAllServers(nsISupportsArray **_retval)
+nsMsgAccountManager::GetAllServers(nsISupportsArray **_retval)
 {
   nsresult rv;
   nsISupportsArray *servers;
@@ -588,7 +588,7 @@ nsMsgAccountManager::upgradePrefs()
 
       rv = m_prefs->CopyCharPref("mail.directory", &oldstr);
       if (NS_SUCCEEDED(rv)) {
-        popServer->SetRootFolderPath(oldstr);
+        server->SetLocalPath(oldstr);
         PR_Free(oldstr);
       }