diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:34:50 +0000 |
| commit | def92d1b8e9d373e2f6f27c366d578d97d8960c6 (patch) | |
| tree | 2ef34b9ad8bb9a9220e05d60352558b15f513894 /toolkit/xre/nsAppRunner.cpp | |
| parent | Adding debian version 125.0.3-1. (diff) | |
| download | firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.tar.xz firefox-def92d1b8e9d373e2f6f27c366d578d97d8960c6.zip | |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/xre/nsAppRunner.cpp')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index c1b712984b..35c58d9b36 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -285,8 +285,6 @@ static const char kPrefHealthReportUploadEnabled[] = static const char kPrefDefaultAgentEnabled[] = "default-browser-agent.enabled"; static const char kPrefServicesSettingsServer[] = "services.settings.server"; -static const char kPrefSecurityContentSignatureRootHash[] = - "security.content.signature.root_hash"; static const char kPrefSetDefaultBrowserUserChoicePref[] = "browser.shell.setDefaultBrowserUserChoice"; #endif // defined(MOZ_DEFAULT_BROWSER_AGENT) @@ -577,7 +575,7 @@ bool BrowserTabsRemoteAutostart() { // then we could remove this automation-only env variable. if (gBrowserTabsRemoteAutostart && xpc::AreNonLocalConnectionsDisabled()) { const char* forceDisable = PR_GetEnv("MOZ_FORCE_DISABLE_E10S"); - if (forceDisable && *forceDisable == '1') { + if (forceDisable && !strcmp(forceDisable, "1")) { gBrowserTabsRemoteAutostart = false; status = kE10sForceDisabled; } @@ -2441,8 +2439,6 @@ static void OnDefaultAgentRemoteSettingsPrefChanged(const char* aPref, nsAutoString valueName; if (strcmp(aPref, kPrefServicesSettingsServer) == 0) { valueName.AssignLiteral("ServicesSettingsServer"); - } else if (strcmp(aPref, kPrefSecurityContentSignatureRootHash) == 0) { - valueName.AssignLiteral("SecurityContentSignatureRootHash"); } else { return; } @@ -5595,9 +5591,6 @@ nsresult XREMain::XRE_mainRun() { Preferences::RegisterCallbackAndCall( &OnDefaultAgentRemoteSettingsPrefChanged, kPrefServicesSettingsServer); - Preferences::RegisterCallbackAndCall( - &OnDefaultAgentRemoteSettingsPrefChanged, - kPrefSecurityContentSignatureRootHash); Preferences::RegisterCallbackAndCall( &OnSetDefaultBrowserUserChoicePrefChanged, |