wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-04 23:08:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1359 - Pointlessly rename greprefs.. again.

Browse source
This commit is contained in:
Matt A. Tobin 2020-01-18 13:17:41 -05:00 • committed by Roy Tam
commit 2aca38b372
6 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/libpref/Preferences.cpp
View file

@ -1229,10 +1229,10 @@ static nsresult pref_InitInitialObjects()
nsresult rv;
// In omni.jar case, we load the following prefs:
// - jar:$gre/omni.jar!/greprefs.js
// - jar:$gre/omni.jar!/goanna.js
// - jar:$gre/omni.jar!/defaults/pref/*.js
// In non omni.jar case, we load:
// - $gre/greprefs.js
// - $gre/goanna.js
//
// In both cases, we also load:
// - $gre/defaults/pref/*.js
@ -1259,8 +1259,8 @@ static nsresult pref_InitInitialObjects()
RefPtr<nsZipArchive> jarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::GRE);
if (jarReader) {
// Load jar:$gre/omni.jar!/greprefs.js
rv = pref_ReadPrefFromJar(jarReader, "greprefs.js");
// Load jar:$gre/omni.jar!/goanna.js
rv = pref_ReadPrefFromJar(jarReader, "goanna.js");
NS_ENSURE_SUCCESS(rv, rv);
// Load jar:$gre/omni.jar!/defaults/pref/*.js
@ -1279,12 +1279,12 @@ static nsresult pref_InitInitialObjects()
NS_WARNING("Error parsing preferences.");
}
} else {
// Load $gre/greprefs.js
// Load $gre/goanna.js
nsCOMPtr<nsIFile> greprefsFile;
rv = NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(greprefsFile));
NS_ENSURE_SUCCESS(rv, rv);
rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("greprefs.js"));
rv = greprefsFile->AppendNative(NS_LITERAL_CSTRING("goanna.js"));
NS_ENSURE_SUCCESS(rv, rv);
rv = openPrefFile(greprefsFile);