From d5445de86de80017a98af12e664829237cb4ae03 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Tue, 14 Sep 1999 12:08:02 +0000 Subject: [PATCH] check the return values when calling SetDefaultLocalPath(). mail.root.pop wasn't getting set when migrating a profile that used pop. it was caused by a simple cut and paste error. --- mailnews/base/src/nsMsgAccountManager.cpp | 8 ++++---- mailnews/local/build/nsMsgLocalFactory.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mailnews/base/src/nsMsgAccountManager.cpp b/mailnews/base/src/nsMsgAccountManager.cpp index 70f6797b284a..e5812cecd0ac 100644 --- a/mailnews/base/src/nsMsgAccountManager.cpp +++ b/mailnews/base/src/nsMsgAccountManager.cpp @@ -1551,7 +1551,7 @@ nsMsgAccountManager::MigrateLocalMailAccount(nsIMsgIdentity *identity) if (NS_FAILED(rv)) return rv; // set the default local path for "none" - server->SetDefaultLocalPath(mailDir); + rv = server->SetDefaultLocalPath(mailDir); if (NS_FAILED(rv)) return rv; rv = mailDir->Exists(&dirExists); @@ -1670,7 +1670,7 @@ nsMsgAccountManager::MigratePopAccount(nsIMsgIdentity *identity) if (NS_FAILED(rv)) return rv; // set the default local path for "pop3" - server->SetDefaultLocalPath(mailDir); + rv = server->SetDefaultLocalPath(mailDir); if (NS_FAILED(rv)) return rv; rv = mailDir->Exists(&dirExists); @@ -1853,7 +1853,7 @@ nsMsgAccountManager::MigrateImapAccount(nsIMsgIdentity *identity, const char *ho // we only need to do this once if (!m_alreadySetImapDefaultLocalPath) { // set the default local path for "imap" - server->SetDefaultLocalPath(imapMailDir); + rv = server->SetDefaultLocalPath(imapMailDir); if (NS_FAILED(rv)) return rv; m_alreadySetImapDefaultLocalPath = PR_TRUE; @@ -2153,7 +2153,7 @@ nsMsgAccountManager::MigrateNewsAccount(nsIMsgIdentity *identity, const char *ho if (NS_FAILED(rv)) return rv; // set the default local path for "nntp" - server->SetDefaultLocalPath(nntpRootDir); + rv = server->SetDefaultLocalPath(nntpRootDir); if (NS_FAILED(rv)) return rv; // set the newsrc root for "nntp" diff --git a/mailnews/local/build/nsMsgLocalFactory.cpp b/mailnews/local/build/nsMsgLocalFactory.cpp index 782398891176..30075958eba4 100644 --- a/mailnews/local/build/nsMsgLocalFactory.cpp +++ b/mailnews/local/build/nsMsgLocalFactory.cpp @@ -315,8 +315,8 @@ NSRegisterSelf(nsISupports* aServMgr, const char* path) if (NS_FAILED(rv)) finalResult = rv; rv = compMgr->RegisterComponent(kPop3ServiceCID, - "POP3 Protocol Information", - NS_NONEPROTOCOLINFO_PROGID, + "pop3 Protocol Information", + NS_POP3PROTOCOLINFO_PROGID, path, PR_TRUE, PR_TRUE); if (NS_FAILED(rv)) finalResult = rv;