diff options
Diffstat (limited to 'data/patches/icecat-preferences.patch')
| -rw-r--r-- | data/patches/icecat-preferences.patch | 49 |
1 files changed, 34 insertions, 15 deletions
diff --git a/data/patches/icecat-preferences.patch b/data/patches/icecat-preferences.patch index 57d3c5a..46bfa8b 100644 --- a/data/patches/icecat-preferences.patch +++ b/data/patches/icecat-preferences.patch @@ -1,6 +1,6 @@ ---- a/browser/components/preferences/privacy.inc.xhtml.orig 2020-09-06 22:53:37.160379447 -0400 -+++ b/browser/components/preferences/privacy.inc.xhtml 2020-09-06 22:45:17.436948014 -0400 -@@ -602,6 +602,70 @@ +--- a/browser/components/preferences/privacy.inc.xhtml.orig 2021-08-17 15:38:19.838881866 -0400 ++++ b/browser/components/preferences/privacy.inc.xhtml 2021-08-17 15:39:01.382760058 -0400 +@@ -632,6 +632,76 @@ data-l10n-id="addressbar-suggestions-settings"/> </groupbox> @@ -46,12 +46,19 @@ + </vbox> + <vbox> + <checkbox id="detectCaptivePortal" data-l10n-id="detect-captive-portal-option" -+ preference="captivedetect.canonicalURL"/> ++ preference="network.captive-portal-service.enabled"/> + <vbox class="indent"> + <label data-l10n-id="detect-captive-portal-description"/> + </vbox> + </vbox> + <vbox> ++ <checkbox id="detectNetworkConnectivity" data-l10n-id="detect-network-connectivity-option" ++ preference="network.connectivity-service.enabled"/> ++ <vbox class="indent"> ++ <label data-l10n-id="detect-network-connectivity-description"/> ++ </vbox> ++ </vbox> ++ <vbox> + <checkbox id="geolocation" data-l10n-id="geolocation-option" + preference="browser.search.geoip.url"/> + <vbox class="indent"> @@ -67,15 +74,14 @@ + </vbox> +</groupbox> + -+ <hbox id="permissionsCategory" class="subcategory" hidden="true" ---- a/browser/components/preferences/privacy.js.orig 2020-09-06 22:53:44.008371642 -0400 -+++ b/browser/components/preferences/privacy.js 2020-09-06 23:09:21.419302924 -0400 -@@ -127,6 +127,15 @@ - { id: "browser.urlbar.suggest.openpage", type: "bool" }, +--- a/browser/components/preferences/privacy.js.orig 2021-08-17 15:39:19.662709308 -0400 ++++ b/browser/components/preferences/privacy.js 2021-08-17 16:10:17.129079115 -0400 +@@ -138,6 +138,16 @@ { id: "browser.urlbar.suggest.topsites", type: "bool" }, + { id: "browser.urlbar.suggest.engines", type: "bool" }, + // IceCat-specific + { id: "javascript.enabled", type: "bool" }, @@ -83,13 +89,14 @@ + { id: "extensions.update.enabled", type: "bool" }, + { id: "network.http.referer.spoofSource", type: "bool" }, + { id: "webgl.disabled", type: "bool" }, -+ { id: "captivedetect.canonicalURL", type: "string" }, ++ { id: "network.captive-portal-service.enabled", type: "bool" }, ++ { id: "network.connectivity-service.enabled", type: "bool" }, + { id: "browser.search.geoip.url", type: "string" }, + // History { id: "places.history.enabled", type: "bool" }, { id: "browser.formfill.enable", type: "bool" }, -@@ -615,6 +624,21 @@ +@@ -706,6 +716,24 @@ setSyncFromPrefListener("enableOCSP", () => this.readEnableOCSP()); setSyncToPrefListener("enableOCSP", () => this.writeEnableOCSP()); @@ -102,6 +109,9 @@ + setSyncFromPrefListener("detectCaptivePortal", () => this.readDetectCaptive()); + setSyncToPrefListener("detectCaptivePortal", () => this.writeDetectCaptive()); + ++ setSyncFromPrefListener("detectNetworkConnectivity", () => this.readDetectConnectivity()); ++ setSyncToPrefListener("detectNetworkConnectivity", () => this.writeDetectConnectivity()); ++ + setSyncFromPrefListener("geolocation", () => this.readGeolocation()); + setSyncToPrefListener("geolocation", () => this.writeGeolocation()); + @@ -111,7 +121,7 @@ if (AlertsServiceDND) { let notificationsDoNotDisturbBox = document.getElementById( "notificationsDoNotDisturbBox" -@@ -704,6 +728,53 @@ +@@ -825,6 +850,62 @@ SiteDataManager.updateSites(); }, @@ -136,12 +146,21 @@ + }, + + readDetectCaptive() { -+ let pref = Preferences.get("captivedetect.canonicalURL"); -+ return pref.value !== ""; ++ let pref = Preferences.get("network.captive-portal-service.enabled"); ++ return pref.value; + }, + writeDetectCaptive() { + let checkbox = document.getElementById("detectCaptivePortal"); -+ return checkbox.checked ? "http://detectportal.firefox.com/success.txt" : ""; ++ return checkbox.checked; ++ }, ++ ++ readDetectConnectivity() { ++ let pref = Preferences.get("network.connectivity-service.enabled"); ++ return pref.value; ++ }, ++ writeDetectConnectivity() { ++ let checkbox = document.getElementById("detectNetworkConnectivity"); ++ return checkbox.checked; + }, + + readGeolocation() { |