wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-22 23:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "[PALEMOON] Reimplemented selection internet zone information on downloaded files"

Browse source
This commit is contained in:
Moonchild 2018-04-20 13:51:38 +00:00 • committed by Roy Tam
commit 45bda44918
2 changed files with 0 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
application/palemoon/app/profile/palemoon.js
View file

@ -80,14 +80,6 @@ pref("browser.slowstartup.help.url", "http://www.palemoon.org/support/slowstartu
// on a network error page (e.g. cert error) // on a network error page (e.g. cert error)
pref("browser.escape_to_blank", false); 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. // The minimum delay in seconds for the timer to fire.
// default=2 minutes // default=2 minutes
pref("app.update.timerMinimumDelay", 120); pref("app.update.timerMinimumDelay", 120);

32
toolkit/components/jsdownloads/src/DownloadIntegration.jsm
View file

@ -530,37 +530,6 @@ this.DownloadIntegration = {
* @return true if files should be marked * @return true if files should be marked
*/ */
_shouldSaveZoneInformation() { _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"] let key = Cc["@mozilla.org/windows-registry-key;1"]
.createInstance(Ci.nsIWindowsRegKey); .createInstance(Ci.nsIWindowsRegKey);
try { try {
@ -576,7 +545,6 @@ this.DownloadIntegration = {
// If the key is not present, files should be marked by default. // If the key is not present, files should be marked by default.
return true; return true;
} }
#endif
}, },
#endif #endif