summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-04-20 15:52:48 +0200
committerGitHub <noreply@github.com>2018-04-20 15:52:48 +0200
commit27af68f2793185ae05252f5467429d614f7a55b4 (patch)
treeeea0a4a53e503d3a2706c7cda2753749c719c877
parent954b1888d2da049878b36034ca7d7f1f1dce6538 (diff)
parentf5c377092c2685625d36fdcede15567800a4d52c (diff)
downloadUXP-27af68f2793185ae05252f5467429d614f7a55b4.tar
UXP-27af68f2793185ae05252f5467429d614f7a55b4.tar.gz
UXP-27af68f2793185ae05252f5467429d614f7a55b4.tar.lz
UXP-27af68f2793185ae05252f5467429d614f7a55b4.tar.xz
UXP-27af68f2793185ae05252f5467429d614f7a55b4.zip
Merge pull request #216 from MoonchildProductions/revert-215-pm_zone-information_1
Revert "[PALEMOON] Reimplemented "Time Zone Information""
-rw-r--r--application/palemoon/app/profile/palemoon.js8
-rw-r--r--toolkit/components/jsdownloads/src/DownloadIntegration.jsm32
2 files changed, 0 insertions, 40 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index 453be9c99..ee4a95d38 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -80,14 +80,6 @@ pref("browser.slowstartup.help.url", "http://www.palemoon.org/support/slowstartu
// on a network error page (e.g. cert error)
pref("browser.escape_to_blank", false);
-#ifdef XP_WIN
-// Save internet zone information on downloaded files:
-// 0 => Never
-// 1 => Always
-// 2 => Use system setting
-pref("browser.download.saveZoneInformation", 2);
-#endif
-
// The minimum delay in seconds for the timer to fire.
// default=2 minutes
pref("app.update.timerMinimumDelay", 120);
diff --git a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
index 38b89ae8e..1c30599f5 100644
--- a/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
+++ b/toolkit/components/jsdownloads/src/DownloadIntegration.jsm
@@ -530,37 +530,6 @@ this.DownloadIntegration = {
* @return true if files should be marked
*/
_shouldSaveZoneInformation() {
-#ifdef MC_PALEMOON
- let zonePref = 2;
- try {
- zonePref = Services.prefs.getIntPref("browser.download.saveZoneInformation");
- } catch (ex) {}
-
- switch (zonePref) {
- case 0: // Never
- return false;
- case 1: // Always
- return true;
- case 2: // System-defined
- let key = Cc["@mozilla.org/windows-registry-key;1"]
- .createInstance(Ci.nsIWindowsRegKey);
- try {
- key.open(Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER,
- "Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Attachments",
- Ci.nsIWindowsRegKey.ACCESS_QUERY_VALUE);
- try {
- return key.readIntValue("SaveZoneInformation") != 1;
- } finally {
- key.close();
- }
- } catch (ex) {
- // If the key is not present, files should be marked by default.
- return true;
- }
- default: // Invalid pref value defaults marking files.
- return true;
- }
-#else
let key = Cc["@mozilla.org/windows-registry-key;1"]
.createInstance(Ci.nsIWindowsRegKey);
try {
@@ -576,7 +545,6 @@ this.DownloadIntegration = {
// If the key is not present, files should be marked by default.
return true;
}
-#endif
},
#endif