Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

first part of fix for bug 180965 - if the GRE directory is the same as the normal components directory, then dont enumerate it twice.

Browse Source 
r=dougt, sr=darin
This commit is contained in:
alecf%netscape.com 2002-11-20 01:19:37 +00:00
parent aba0befae8
commit de14c02d9c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp
View File

@ -237,13 +237,13 @@ PRBool xptiInterfaceInfoManager::BuildFileSearchPath(nsISupportsArray** aPath)
if(!searchPath)
return PR_FALSE;
nsCOMPtr<nsILocalFile> dir;
nsCOMPtr<nsILocalFile> compDir;
// Always put components directory first
if(NS_FAILED(GetDirectoryFromDirService(NS_XPCOM_COMPONENT_DIR,
getter_AddRefs(dir))) ||
!searchPath->AppendElement(dir))
getter_AddRefs(compDir))) ||
!searchPath->AppendElement(compDir))
{
return PR_FALSE;
}
@ -264,7 +264,12 @@ PRBool xptiInterfaceInfoManager::BuildFileSearchPath(nsISupportsArray** aPath)
getter_AddRefs(greComponentDirectory));
if (NS_SUCCEEDED(rv))
{
searchPath->AppendElement(greComponentDirectory);
// make sure we only append a directory if its a different one
PRBool equalsCompDir = PR_FALSE;
greComponentDirectory->Equals(compDir, &equalsCompDir);
if (!equalsCompDir)
searchPath->AppendElement(greComponentDirectory);
}
(void) AppendFromDirServiceList(NS_APP_PLUGINS_DIR_LIST, searchPath);