зеркало из https://github.com/mozilla/pjs.git
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
This commit is contained in:
Родитель
74be603308
Коммит
07976b6f75
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче