wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 822048 - use a /fonts/ subdir for any locally-added fonts stored in the profile. r=blassey

Browse Source
This commit is contained in:
Jonathan Kew 2012-12-18 11:18:56 +00:00
parent d44ab31b15
commit c346f7ddb4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/thebes/gfxFT2FontList.cpp
View File

@ -1081,10 +1081,11 @@ gfxFT2FontList::FindFonts()
} }
// look for fonts shipped with the product // look for fonts shipped with the product
NS_NAMED_LITERAL_STRING(kFontsDirName, "fonts");
nsCOMPtr<nsIFile> localDir; nsCOMPtr<nsIFile> localDir;
nsresult rv = NS_GetSpecialDirectory(NS_APP_RES_DIR, nsresult rv = NS_GetSpecialDirectory(NS_APP_RES_DIR,
getter_AddRefs(localDir)); getter_AddRefs(localDir));
if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(localDir->Append(NS_LITERAL_STRING("fonts")))) { if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(localDir->Append(kFontsDirName))) {
ExtractFontsFromJar(localDir); ExtractFontsFromJar(localDir);
nsCString localPath; nsCString localPath;
rv = localDir->GetNativePath(localPath); rv = localDir->GetNativePath(localPath);
@ -1093,10 +1094,10 @@ gfxFT2FontList::FindFonts()
} }
} }
// look for locally-added fonts in the profile // look for locally-added fonts in a "fonts" subdir of the profile
rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR, rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_LOCAL_50_DIR,
getter_AddRefs(localDir)); getter_AddRefs(localDir));
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(localDir->Append(kFontsDirName))) {
nsCString localPath; nsCString localPath;
rv = localDir->GetNativePath(localPath); rv = localDir->GetNativePath(localPath);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {