Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-04 05:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 53218. r-pav, a=ben

Browse Source
This commit is contained in:
hyatt%netscape.com 2000-10-30 01:50:20 +00:00
parent c20f12ba64
commit c0f10a0cd8
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chrome/src/nsChromeRegistry.cpp
View File

@ -724,6 +724,9 @@ nsChromeRegistry::SelectPackageInProvider(nsIRDFResource *aPackageList,
providerNameUC.AssignWithConversion(aProviderName); providerNameUC.AssignWithConversion(aProviderName);
packageNameUC.AssignWithConversion(packageName); packageNameUC.AssignWithConversion(packageName);
PRBool useProfile = !mProfileRoot.IsEmpty(); PRBool useProfile = !mProfileRoot.IsEmpty();
if (packageName.Equals("global") || packageName.Equals("communicator"))
useProfile = PR_FALSE; // Always force the auto-selection to be in the
// install dir for the packages required to bring up the profile UI.
rv = SelectProviderForPackage(aProvider, providerNameUC.GetUnicode(), rv = SelectProviderForPackage(aProvider, providerNameUC.GetUnicode(),
packageNameUC.GetUnicode(), aArc, useProfile, PR_TRUE); packageNameUC.GetUnicode(), aArc, useProfile, PR_TRUE);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
@ -1934,6 +1937,12 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
// See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL, allowScripts // See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL, allowScripts
// and package arcs. // and package arcs.
if (val.Find(":packages") != -1 && !aProviderType.Equals(nsCAutoString("package"))) { if (val.Find(":packages") != -1 && !aProviderType.Equals(nsCAutoString("package"))) {
PRBool doAppendPackage = appendPackage;
PRInt32 perProviderPackageCount;
container->GetCount(&perProviderPackageCount);
if (perProviderPackageCount > 1)
doAppendPackage = PR_TRUE;
// Iterate over our kids a second time. // Iterate over our kids a second time.
nsCOMPtr<nsISimpleEnumerator> seqKids2; nsCOMPtr<nsISimpleEnumerator> seqKids2;
rv = container->GetElements(getter_AddRefs(seqKids2)); rv = container->GetElements(getter_AddRefs(seqKids2));
@ -1970,7 +1979,7 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
baseURL += providerName; baseURL += providerName;
baseURL += "/"; baseURL += "/";
} }
if (appendPackage) { if (doAppendPackage) {
baseURL += packageName; baseURL += packageName;
baseURL += "/"; baseURL += "/";
} }

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

@ -724,6 +724,9 @@ nsChromeRegistry::SelectPackageInProvider(nsIRDFResource *aPackageList,
providerNameUC.AssignWithConversion(aProviderName); providerNameUC.AssignWithConversion(aProviderName);
packageNameUC.AssignWithConversion(packageName); packageNameUC.AssignWithConversion(packageName);
PRBool useProfile = !mProfileRoot.IsEmpty(); PRBool useProfile = !mProfileRoot.IsEmpty();
if (packageName.Equals("global") || packageName.Equals("communicator"))
useProfile = PR_FALSE; // Always force the auto-selection to be in the
// install dir for the packages required to bring up the profile UI.
rv = SelectProviderForPackage(aProvider, providerNameUC.GetUnicode(), rv = SelectProviderForPackage(aProvider, providerNameUC.GetUnicode(),
packageNameUC.GetUnicode(), aArc, useProfile, PR_TRUE); packageNameUC.GetUnicode(), aArc, useProfile, PR_TRUE);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
@ -1934,6 +1937,12 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
// See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL, allowScripts // See if we're a packages seq in a skin/locale. If so, we need to set up the baseURL, allowScripts
// and package arcs. // and package arcs.
if (val.Find(":packages") != -1 && !aProviderType.Equals(nsCAutoString("package"))) { if (val.Find(":packages") != -1 && !aProviderType.Equals(nsCAutoString("package"))) {
PRBool doAppendPackage = appendPackage;
PRInt32 perProviderPackageCount;
container->GetCount(&perProviderPackageCount);
if (perProviderPackageCount > 1)
doAppendPackage = PR_TRUE;
// Iterate over our kids a second time. // Iterate over our kids a second time.
nsCOMPtr<nsISimpleEnumerator> seqKids2; nsCOMPtr<nsISimpleEnumerator> seqKids2;
rv = container->GetElements(getter_AddRefs(seqKids2)); rv = container->GetElements(getter_AddRefs(seqKids2));
@ -1970,7 +1979,7 @@ NS_IMETHODIMP nsChromeRegistry::InstallProvider(const nsCString& aProviderType,
baseURL += providerName; baseURL += providerName;
baseURL += "/"; baseURL += "/";
} }
if (appendPackage) { if (doAppendPackage) {
baseURL += packageName; baseURL += packageName;
baseURL += "/"; baseURL += "/";
} }