merge default to SEAMONKEY_2_49_ESR_RELBRANCH. a=frg DONTBUILD SEAMONKEY_2_49_ESR_RELBRANCH
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 12 May 2019 14:35:00 +0200
branchSEAMONKEY_2_49_ESR_RELBRANCH
changeset 28311 cb995a74a5bc22968520a2e6f70e94ae84b1dff6
parent 28308 fa67a1ccc37729b3e3f748dab7099972c8f197fc (current diff)
parent 28310 341e6b4a9882faea9905dd4a85024f0c21589999 (diff)
child 28312 32ca9eea4f9bcdc7c0ab7b95c4a3358f6ef8d33a
push id2134
push userfrgrahl@gmx.net
push dateSun, 12 May 2019 12:35:43 +0000
treeherdercomm-esr52@cb995a74a5bc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg
merge default to SEAMONKEY_2_49_ESR_RELBRANCH. a=frg DONTBUILD
--- a/suite/common/nsContextMenu.js
+++ b/suite/common/nsContextMenu.js
@@ -76,17 +76,17 @@ nsContextMenu.prototype = {
 
     var contentType = null;
     var contentDisposition = null;
     if (this.onImage) {
       try {
         let imageCache = Components.classes["@mozilla.org/image/tools;1"]
                                    .getService(Components.interfaces.imgITools)
                                    .getImgCacheForDocument(doc);
-        let props = imageCache.findEntryProperties(popupNode.currentURI);
+        let props = imageCache.findEntryProperties(popupNode.currentURI, doc);
         if (props) {
           let nsISupportsCString = Components.interfaces.nsISupportsCString;
           contentType = props.get("type", nsISupportsCString).data;
           try {
             contentDisposition = props.get("content-disposition",
                                            nsISupportsCString).data;
           } catch (e) {}
         }
--- a/suite/common/pref/pref-cookies.js
+++ b/suite/common/pref/pref-cookies.js
@@ -4,35 +4,31 @@
 
 function Startup()
 {
   SetDisables(false);
 }
 
 function SetDisables(aSetFocus)
 {
+  // Policy 1 was "ask before accepting" and is no longer valid.
+
   // const for Cookie Accept Policy
   const kCookiesDisabled = 2;
   // const for Cookie Lifetime Policy
-  const kAskBeforeAccepting = 1;
   const kAcceptForNDays = 3;
 
   var behavior = document.getElementById("networkCookieBehavior");
   var behaviorPref = document.getElementById(behavior.getAttribute("preference"));
 
   var lifetime = document.getElementById("networkCookieLifetime");
   var lifetimePref = document.getElementById(lifetime.getAttribute("preference"));
   var days = document.getElementById("lifetimeDays");
   var daysPref = document.getElementById(days.getAttribute("preference"));
 
-  var session = document.getElementById("alwaysAcceptSession");
-  var sessionPref = document.getElementById(session.getAttribute("preference"));
-
   var cookiesDisabled = (behaviorPref.value == kCookiesDisabled);
   lifetime.disabled = cookiesDisabled || lifetimePref.locked;
   days.disabled = cookiesDisabled || daysPref.locked ||
                   (lifetimePref.value != kAcceptForNDays);
-  session.disabled = cookiesDisabled || sessionPref.locked ||
-                     (lifetimePref.value != kAskBeforeAccepting);
 
   if (!days.disabled && aSetFocus)
     days.focus();
 }
--- a/suite/common/src/nsSuiteGlue.js
+++ b/suite/common/src/nsSuiteGlue.js
@@ -33,16 +33,19 @@ XPCOMUtils.defineLazyModuleGetter(this, 
                                   "resource://gre/modules/BookmarkHTMLUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "BookmarkJSONUtils",
                                   "resource://gre/modules/BookmarkJSONUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "AppConstants",
+                                  "resource://gre/modules/AppConstants.jsm");
+
 XPCOMUtils.defineLazyGetter(this, "DebuggerServer", () => {
   var tmp = {};
   Components.utils.import("resource://devtools/shared/Loader.jsm", tmp);
   return tmp.require("devtools/server/main").DebuggerServer;
 });
 
 // We try to backup bookmarks at idle times, to avoid doing that at shutdown.
 // Number of idle seconds before trying to backup bookmarks.  15 minutes.
@@ -809,16 +812,20 @@ SuiteGlue.prototype = {
     Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
   },
 
   /*
    * _shouldShowUpdateWarning - Determines if the user should be warned about
    * having updates off and an old build that likely should be updated.
    */
   _shouldShowUpdateWarning: function () {
+    // If the Updater is not available we don't show the warning.
+    if (!AppConstants.MOZ_UPDATER) {
+      return false;  
+    }
     // Look for an unconditional override pref. If set, do what it says.
     // (true --> never show, false --> always show)
     try {
       return !Services.prefs.getBoolPref("app.updatecheck.override");
     } catch (e) { }
     // If updates are enabled, we don't need to worry.
     if (Services.prefs.getBoolPref("app.update.enabled"))
       return false;