Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 57733.

Browse Source
This commit is contained in:
hyatt%netscape.com 2000-10-25 03:03:08 +00:00
parent c1aa1c70d5
commit 7662270ea6
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chrome/src/nsChromeRegistry.cpp
View File

@ -657,7 +657,7 @@ nsChromeRegistry::FindProvider(const nsCString& aPackage,
rv = SelectPackageInProvider(packageList, aPackage, aProvider, providerName,
aArc, aSelectedProvider);
if (NS_FAILED(rv)) return rv;
if (aSelectedProvider)
if (*aSelectedProvider)
return NS_OK;
}
}
@ -718,16 +718,14 @@ nsChromeRegistry::SelectPackageInProvider(nsIRDFResource *aPackageList,
rv = nsChromeRegistry::FollowArc(mChromeDataSource, packageName, package, mName);
if (NS_FAILED(rv)) continue; // don't fail if package has not yet been installed
// select provider assuming it comes from the install directory.
// XXX we really should be keeping track of whether it's from there,
// or from the profile
if (packageName.Equals(aPackage)) {
nsAutoString providerNameUC;
nsAutoString packageNameUC;
providerNameUC.AssignWithConversion(aProviderName);
packageNameUC.AssignWithConversion(packageName);
PRBool useProfile = !mProfileRoot.IsEmpty();
rv = SelectProviderForPackage(aProvider, providerNameUC.GetUnicode(),
packageNameUC.GetUnicode(), aArc, PR_FALSE, PR_TRUE);
packageNameUC.GetUnicode(), aArc, useProfile, PR_TRUE);
if (NS_FAILED(rv)) return rv;
*aSelectedProvider = kid;
NS_ADDREF(*aSelectedProvider);

8
rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -657,7 +657,7 @@ nsChromeRegistry::FindProvider(const nsCString& aPackage,
rv = SelectPackageInProvider(packageList, aPackage, aProvider, providerName,
aArc, aSelectedProvider);
if (NS_FAILED(rv)) return rv;
if (aSelectedProvider)
if (*aSelectedProvider)
return NS_OK;
}
}
@ -718,16 +718,14 @@ nsChromeRegistry::SelectPackageInProvider(nsIRDFResource *aPackageList,
rv = nsChromeRegistry::FollowArc(mChromeDataSource, packageName, package, mName);
if (NS_FAILED(rv)) continue; // don't fail if package has not yet been installed
// select provider assuming it comes from the install directory.
// XXX we really should be keeping track of whether it's from there,
// or from the profile
if (packageName.Equals(aPackage)) {
nsAutoString providerNameUC;
nsAutoString packageNameUC;
providerNameUC.AssignWithConversion(aProviderName);
packageNameUC.AssignWithConversion(packageName);
PRBool useProfile = !mProfileRoot.IsEmpty();
rv = SelectProviderForPackage(aProvider, providerNameUC.GetUnicode(),
packageNameUC.GetUnicode(), aArc, PR_FALSE, PR_TRUE);
packageNameUC.GetUnicode(), aArc, useProfile, PR_TRUE);
if (NS_FAILED(rv)) return rv;
*aSelectedProvider = kid;
NS_ADDREF(*aSelectedProvider);