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

Bug 295475: retain legacy overlayinfo; r=Neil, sr=darin, a=shaver

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@173964 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mnyromyr%tprac.de 2005-06-01 19:26:41 +00:00
parent 7204a6d40e
commit 4b42690a8d
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
mozilla/rdf/chrome/src/nsChromeRegistry.cpp
View File

@ -140,7 +140,8 @@ nsChromeRegistry::nsChromeRegistry() : mRDFService(nsnull),
mProfileInitialized(PR_FALSE),
mRuntimeProvider(PR_FALSE),
mBatchInstallFlushes(PR_FALSE),
mSearchedForOverride(PR_FALSE)
mSearchedForOverride(PR_FALSE),
mLegacyOverlayinfo(PR_FALSE)
{
mDataSourceTable = nsnull;
}
@ -999,8 +1000,21 @@ nsChromeRegistry::GetDynamicDataSource(nsIURI *aChromeURL,
}
// Retrieve the mInner data source.
const nsACString& overlayFile = aIsOverlay ?
NS_LITERAL_CSTRING("overlays.rdf") : NS_LITERAL_CSTRING("stylesheets.rdf");
nsCAutoString overlayFile;
if (aUseProfile && mLegacyOverlayinfo)
{
overlayFile.AppendLiteral("overlayinfo/");
overlayFile += package;
if (aIsOverlay)
overlayFile.AppendLiteral("/content/");
else
overlayFile.AppendLiteral("/skin/");
}
if (aIsOverlay)
overlayFile.AppendLiteral("overlays.rdf");
else
overlayFile.AppendLiteral("stylesheets.rdf");
return LoadDataSource(overlayFile, aResult, aUseProfile, nsnull);
}
@ -2992,6 +3006,7 @@ nsresult nsChromeRegistry::LoadInstallDataSource()
nsresult nsChromeRegistry::LoadProfileDataSource()
{
mLegacyOverlayinfo = PR_FALSE;
nsresult rv = GetProfileRoot(mProfileRoot);
if (NS_SUCCEEDED(rv)) {
// Load the profile search path for skins, content, and locales
@ -3017,6 +3032,22 @@ nsresult nsChromeRegistry::LoadProfileDataSource()
// We have to flush the chrome skin cache...
FlushSkinCaches();
// make sure we don't lose any old profile overlayinfo
// by checking the existence of the respective overlayinfo/ directory
nsCOMPtr<nsIFile> overlayinfoDir;
rv = NS_GetSpecialDirectory(NS_APP_USER_CHROME_DIR, getter_AddRefs(overlayinfoDir));
if (NS_SUCCEEDED(rv))
{
rv = overlayinfoDir->AppendNative(NS_LITERAL_CSTRING("overlayinfo"));
if (NS_SUCCEEDED(rv))
{
PRBool isLegacyOverlayinfo;
rv = overlayinfoDir->IsDirectory(&isLegacyOverlayinfo);
mLegacyOverlayinfo = NS_SUCCEEDED(rv) && isLegacyOverlayinfo;
}
}
}
return NS_OK;
}

4
mozilla/rdf/chrome/src/nsChromeRegistry.h
View File

@ -274,4 +274,8 @@ protected:
// make sure we only look once for the JAR override
PRPackedBool mSearchedForOverride;
// if we find an old profile overlayinfo/ directory structure, use it
// else use the new flat files
PRPackedBool mLegacyOverlayinfo;
};