From 07976b6f75d5839774522132b8792d6cff0b825b Mon Sep 17 00:00:00 2001 From: "dp%netscape.com" Date: Tue, 8 Feb 2000 21:54:45 +0000 Subject: [PATCH] bug 26937 The code was changing the component registry got from the service to open the application registry. This causes asserts all over. The registry we get from the service is always the component registry --- mailnews/import/eudora/src/nsEudoraFactory.cpp | 2 +- mailnews/import/outlook/src/nsOutlookFactory.cpp | 3 ++- mailnews/import/src/nsImportService.cpp | 2 +- mailnews/import/text/src/nsTextFactory.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mailnews/import/eudora/src/nsEudoraFactory.cpp b/mailnews/import/eudora/src/nsEudoraFactory.cpp index 017a5c37f27..7be0f014ebd 100644 --- a/mailnews/import/eudora/src/nsEudoraFactory.cpp +++ b/mailnews/import/eudora/src/nsEudoraFactory.cpp @@ -77,7 +77,7 @@ NS_METHOD EudoraRegister(nsIComponentManager *aCompMgr, return rv; } - rv = reg->OpenDefault(); + rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Import Eudora, ERROR OPENING THE REGISTRY\n"); return( rv); diff --git a/mailnews/import/outlook/src/nsOutlookFactory.cpp b/mailnews/import/outlook/src/nsOutlookFactory.cpp index 64af3f6dc45..b2e2b6834be 100644 --- a/mailnews/import/outlook/src/nsOutlookFactory.cpp +++ b/mailnews/import/outlook/src/nsOutlookFactory.cpp @@ -81,7 +81,8 @@ NS_METHOD OutlookRegister(nsIComponentManager *aCompMgr, return rv; } - rv = reg->OpenDefault(); + rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); + if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Import Outlook, ERROR OPENING THE REGISTRY\n"); return( rv); diff --git a/mailnews/import/src/nsImportService.cpp b/mailnews/import/src/nsImportService.cpp index 58eed466ae8..2df22158d3b 100644 --- a/mailnews/import/src/nsImportService.cpp +++ b/mailnews/import/src/nsImportService.cpp @@ -514,7 +514,7 @@ nsresult nsImportService::DoDiscover( void) NS_WITH_SERVICE( nsIRegistry, reg, kRegistryCID, &rv); if (NS_FAILED(rv)) return rv; - rv = reg->OpenDefault(); + rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); if (NS_FAILED(rv)) return( rv); nsRegistryKey modulesKey; diff --git a/mailnews/import/text/src/nsTextFactory.cpp b/mailnews/import/text/src/nsTextFactory.cpp index af33319b81c..0f828fe3a82 100644 --- a/mailnews/import/text/src/nsTextFactory.cpp +++ b/mailnews/import/text/src/nsTextFactory.cpp @@ -83,7 +83,7 @@ NS_METHOD TextRegister(nsIComponentManager *aCompMgr, return rv; } - rv = reg->OpenDefault(); + rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry); if (NS_FAILED(rv)) { IMPORT_LOG0( "*** Import Text, ERROR OPENING THE REGISTRY\n"); return( rv);