librewolf-bot/settings
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

moved overrides to bottom

Browse source
This commit is contained in:
fxbrit 2021-05-04 12:30:45 +02:00
parent 6cab042770
commit 845d2bcf11
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
librewolf.cfg
View file

@ -143,6 +143,7 @@ lockPref("network.cookie.thirdparty.nonsecureSessionOnly", true);
// ----------------------------------- // -----------------------------------
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
// TRACKING PROTECTION // TRACKING PROTECTION
>>>>>>> a35eb4b (re-organized and reviewed) >>>>>>> a35eb4b (re-organized and reviewed)
======= =======
@ -177,6 +178,8 @@ if (home_directory) {
} }
// ----------------------------------- // -----------------------------------
=======
>>>>>>> 344e1e8 (moved overrides to bottom)
// TRACKING PROTECTION // TRACKING PROTECTION
// ----------------------------------- // -----------------------------------
@ -2173,15 +2176,21 @@ lockPref("toolkit.winRegisterApplicationRestart", false);
// disable Windows 8.1 Family Safety cert [WINDOWS] // disable Windows 8.1 Family Safety cert [WINDOWS]
lockPref("security.family_safety.mode", 0); lockPref("security.family_safety.mode", 0);
<<<<<<< HEAD
// Windows only? // Windows only?
lockPref("default-browser-agent.enabled", false); lockPref("default-browser-agent.enabled", false);
// ----------------------------------- // -----------------------------------
// # OVERRIDES // # OVERRIDES
=======
// -----------------------------------
// OVERRIDES
>>>>>>> 344e1e8 (moved overrides to bottom)
// ----------------------------------- // -----------------------------------
// allow settings to be overriden with a file at `~/.librewolf/librewolf.overrides.cfg` // allow settings to be overriden with a file at `~/.librewolf/librewolf.overrides.cfg`
// or `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg` (Flatpak). // or `~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg` (Flatpak).
<<<<<<< HEAD
let profile_directory; let profile_directory;
if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) { if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
pref('autoadmin.global_config_url', `file://${profile_directory}/.librewolf/librewolf.overrides.cfg`); pref('autoadmin.global_config_url', `file://${profile_directory}/.librewolf/librewolf.overrides.cfg`);
@ -2192,3 +2201,10 @@ if (profile_directory = getenv('USERPROFILE') || getenv('HOME')) {
======= =======
lockPref("security.family_safety.mode", 0); lockPref("security.family_safety.mode", 0);
>>>>>>> 48fecfd (removed redundant stuff) >>>>>>> 48fecfd (removed redundant stuff)
=======
// not yet verified to work on Windows and MacOS releases
let home_directory = getenv("HOME");
if (home_directory) {
pref("autoadmin.global_config_url", `file://${home_directory}/.librewolf/librewolf.overrides.cfg`);
}
>>>>>>> 344e1e8 (moved overrides to bottom)