From f5c377092c2685625d36fdcede15567800a4d52c Mon Sep 17 00:00:00 2001
From: Moonchild <mcwerewolf@gmail.com>
Date: Fri, 20 Apr 2018 13:51:38 +0000
Subject: Revert "[PALEMOON] Reimplemented selection internet zone information
 on downloaded files"

---
 .../jsdownloads/src/DownloadIntegration.jsm        | 32 ----------------------
 1 file changed, 32 deletions(-)

(limited to 'toolkit/components/jsdownloads/src')

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
 
-- 
cgit v1.2.3