Pier Angelo Vendrame pushed to branch mullvad-browser-147.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser

Commits:

3 changed files:

Changes:

  • browser/config/mozconfigs/base-browser
    ... ... @@ -27,6 +27,8 @@ ac_add_options --enable-proxy-bypass-protection
    27 27
     # See bugs #30575 and #32418: system policies are harmful either because they
    
    28 28
     # could allow proxy bypass, and override a number of other preferences we set
    
    29 29
     ac_add_options --disable-system-policies
    
    30
    +# tor-browser#44394
    
    31
    +ac_add_options --disable-system-preferences
    
    30 32
     
    
    31 33
     # See bug #41131
    
    32 34
     ac_add_options --disable-backgroundtasks
    

  • modules/libpref/Preferences.cpp
    ... ... @@ -5218,7 +5218,7 @@ nsresult Preferences::InitInitialObjects(bool aIsStartup) {
    5218 5218
         }
    
    5219 5219
       }
    
    5220 5220
     
    
    5221
    -#if defined(MOZ_WIDGET_GTK)
    
    5221
    +#if defined(MOZ_WIDGET_GTK) && defined(MOZ_SYSTEM_PREFERENCES)
    
    5222 5222
       // To ensure the system-wide preferences are not overwritten by
    
    5223 5223
       // firefox/browser/defauts/preferences/*.js we need to load
    
    5224 5224
       // the /etc/firefox/defaults/pref/*.js settings as last.
    

  • toolkit/moz.configure
    ... ... @@ -4052,6 +4052,17 @@ option(
    4052 4052
     
    
    4053 4053
     set_config("MOZ_SYSTEM_POLICIES", True, when="--enable-system-policies")
    
    4054 4054
     
    
    4055
    +# System preferences
    
    4056
    +# ==============================================================
    
    4057
    +
    
    4058
    +option(
    
    4059
    +    "--disable-system-preferences",
    
    4060
    +    help="Disable reading preferences from /etc/firefox",
    
    4061
    +)
    
    4062
    +
    
    4063
    +set_config("MOZ_SYSTEM_PREFERENCES", True, when="--enable-system-preferences")
    
    4064
    +set_define("MOZ_SYSTEM_PREFERENCES", True, when="--enable-system-preferences")
    
    4065
    +
    
    4055 4066
     # Allow disabling the creation a legacy profile
    
    4056 4067
     # ==============================================================
    
    4057 4068