Merge pull request #216 from MoonchildProductions/revert-215-pm_zone-information_1

Revert "[PALEMOON] Reimplemented "Time Zone Information""

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