Fixing registry premature closing bug. r=dp

intl/strres/src/nsStringBundle.cpp

@@ -396,11 +396,6 @@ nsExtensibleStringBundle::nsExtensibleStringBundle(const char * aRegistryKey,
     res = registry->GetString(key, "name", &name);
     if (NS_FAILED(res)) goto done1;
 
-    // XXX Ok. We have a bug here right now: after this call, the registry 
-    // magic number gets corrupted, so the second file will not 
-    // be created/used. Workaround: use only one file. Hurts extensibility,
-    // but we can't see it until we need it. A work-around would be possible.
-    // But I think we should really fix the original bug...
     res = sbServ->CreateBundle(name, aLocale, &bundle);
     if (NS_FAILED(res)) goto done1;
 

intl/uconv/src/nsCharsetConverterManager.cpp

@@ -336,11 +336,6 @@ void nsCharsetConverterManager::FillInfoArrays()
     nsIRegistry::GetIID(), (nsISupports**)&registry);
   if (NS_FAILED(res)) goto done;
 
-  // open the registry
-  res = registry->OpenWellKnownRegistry(
-    nsIRegistry::ApplicationComponentRegistry);
-  if (NS_FAILED(res)) goto done;
-
   // get subtree
   res = registry->GetSubtree(nsIRegistry::Common,  
     "software/netscape/intl/uconv", &uconvKey);
@@ -408,7 +403,6 @@ done1:
   // finish and clean up
 done:
   if (registry != NULL) {
-    registry->Close();
     nsServiceManager::ReleaseService(NS_REGISTRY_PROGID, registry);
   }