Merge branch 'redwood' into releaseRELBASE_20200929RC_20200924

5 files changed, 3 insertions, 30 deletions

diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index d9b167547..9daef44a4 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -277,6 +277,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'psapi',
         'ws2_32',
         'dbghelp',
+        'dwmapi',
         'rasapi32',
         'rasdlg',
         'iphlpapi',
diff --git a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
index a99c825f1..098896d99 100644
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -33,10 +33,6 @@
 <!ENTITY warning.updatesecurity.enable.label       "Enable">
 <!ENTITY warning.updatesecurity.enable.tooltip     "Enable add-on update security checking">
 
-<!-- global informations -->
-<!ENTITY info.plugincheck.label                 "Check to see if your plugins are up to date">
-<!ENTITY info.plugincheck.tooltip               "Check to see if your plugins are up to date">
-
 <!-- categories / views -->
 <!ENTITY view.search.label                    "Search">
 <!ENTITY view.discover.label                  "Get Add-ons">
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 3c3b5894b..99b71562f 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -809,15 +809,6 @@ var gViewController = {
       }
     },
 
-/* Plugincheck service is currently N/A for Pale Moon
-    cmd_pluginCheck: {
-      isEnabled: function cmd_pluginCheck_isEnabled() true,
-      doCommand: function cmd_pluginCheck_doCommand() {
-        openURL(Services.urlFormatter.formatURLPref("plugins.update.url"));
-      }
-    },
-*/
-
     cmd_toggleAutoUpdateDefault: {
       isEnabled: function cmd_toggleAutoUpdateDefault_isEnabled() true,
       doCommand: function cmd_toggleAutoUpdateDefault_doCommand() {
@@ -3028,10 +3019,7 @@ var gDetailView = {
           "details.notification.outdated",
           [this._addon.name], 1
         );
-        var warningLink = document.getElementById("detail-warning-link");
-        warningLink.value = gStrings.ext.GetStringFromName("details.notification.outdated.link");
-        warningLink.href = Services.urlFormatter.formatURLPref("plugins.update.url");
-        warningLink.hidden = false;
+        document.getElementById("detail-warning-link").hidden = true;
       } else if (this._addon.blocklistState == Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE) {
         this.node.setAttribute("notification", "error");
         document.getElementById("detail-error").textContent = gStrings.ext.formatStringFromName(
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index e2eef852a..fc19be4b3 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -1324,9 +1324,7 @@
                 "notification.outdated",
                 [this.mAddon.name], 1
               );
-              this._warningLink.value = gStrings.ext.GetStringFromName("notification.outdated.link");
-              this._warningLink.href = Services.urlFormatter.formatURLPref("plugins.update.url");
-              this._warningLink.hidden = false;
+              this._warningLink.hidden = true;
               this._warningBtn.hidden = true;
             } else if (!isUpgrade && this.mAddon.blocklistState == Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE) {
               this.setAttribute("notification", "error");
diff --git a/toolkit/mozapps/extensions/content/extensions.xul b/toolkit/mozapps/extensions/content/extensions.xul
index 292ecf8d3..70ce55fa2 100644
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -88,7 +88,6 @@
     <command id="cmd_back"/>
     <command id="cmd_forward"/>
     <command id="cmd_enableCheckCompatibility"/>
-<!--    <command id="cmd_pluginCheck"/> -->
     <command id="cmd_enableUpdateSecurity"/>
     <command id="cmd_toggleAutoUpdateDefault"/>
     <command id="cmd_resetAddonAutoUpdate"/>
@@ -355,15 +354,6 @@
               <spacer flex="5000"/> <!-- Necessary to allow the message to wrap -->
             </hbox>
           </hbox>
-<!--      <hbox class="view-header global-info-container plugin-info-container">
-            <hbox class="global-info" flex="1" align="center">
-              <button class="button-link global-info-plugincheck"
-                      label="&info.plugincheck.label;"
-                      tooltiptext="&info.plugincheck.tooltip;"
-                      command="cmd_pluginCheck"/>
-              <spacer flex="5000"/>
-            </hbox>
-          </hbox> -->
           <hbox class="view-header global-info-container experiment-info-container">
             <hbox class="global-info" flex="1" align="center">
               <label value="&experiment.info.label;"/>