Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for #149208 - NS_InitEmbedding() uncoditionally calls AutoRegister

Browse Source 
[When this fix was originally checked in, it broke registration of
components in the MRE dir. This patch fixes it]
r=darin, sr=bryner


git-svn-id: svn://10.0.0.236/trunk@127902 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
chak%netscape.com
2002-08-22 23:04:04 +00:00
parent 2fdf7840d5
commit 115d1eadb1
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/xpcom/build/nsXPComInit.cpp
View File

@@ -523,6 +523,31 @@ nsresult NS_COM NS_InitXPCOM2(nsIServiceManager* *result,
// if we find no persistent registry, we will try to autoregister
// the default components directory.
nsComponentManagerImpl::gComponentManager->AutoRegister(nsnull);
// If the application is using an MRE, then,
// auto register components in the MRE directory as well.
//
// The application indicates that it's using an MRE by
// returning a valid nsIFile when queried (via appFileLocProvider)
// for the NS_MRE_DIR atom as shown below
//
if ( appFileLocationProvider ) {
nsCOMPtr<nsIFile> mreDir;
PRBool persistent = PR_TRUE;
appFileLocationProvider->GetFile(NS_MRE_DIR, &persistent, getter_AddRefs(mreDir));
if (mreDir)
{
rv = nsComponentManagerImpl::gComponentManager->AutoRegister(mreDir);
if (NS_FAILED(rv))
{
NS_ERROR("Could not AutoRegister MRE components");
return rv;
}
}
}
}
// Pay the cost at startup time of starting this singleton.