From 347bfc5741b774d307e6e532e9a67f5a254c10a6 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Sat, 5 Sep 2020 11:27:23 +0000
Subject: [PATCH] [Pale-Moon] Issue MoonchildProductions/UXP#1644 - Remove
 plugin check leftovers (front-end)

Includes appropriate platform pointer update.
---
 application/palemoon/app/profile/palemoon.js   |  3 ---
 .../palemoon/base/content/browser-plugins.js   | 11 +----------
 .../palemoon/components/nsBrowserGlue.js       | 18 ------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js
index 3b048030b..ab5dcda85 100644
--- a/application/palemoon/app/profile/palemoon.js
+++ b/application/palemoon/app/profile/palemoon.js
@@ -683,9 +683,6 @@ pref("plugins.hide_infobar_for_outdated_plugin", false);
 // Pale Moon:pref to always show the plugin indicator or not (default=false)
 pref("plugins.always_show_indicator", false);
 
-pref("plugins.update.url", "https://aus.palemoon.org/plugincheck/");
-pref("plugins.update.notifyUser", false);
-
 //Enable tri-state option (Always/Never/Ask)
 pref("plugins.click_to_play", true);
 
diff --git a/application/palemoon/base/content/browser-plugins.js b/application/palemoon/base/content/browser-plugins.js
index 914f9528b..9e44981bb 100644
--- a/application/palemoon/base/content/browser-plugins.js
+++ b/application/palemoon/base/content/browser-plugins.js
@@ -332,12 +332,6 @@ var gPluginHandler = {
     BrowserOpenAddonsMgr("addons://list/plugin");
   },
 
-  // Callback for user clicking on the link in a click-to-play plugin
-  // (where the plugin has an update)
-  openPluginUpdatePage: function(aEvent) {
-    openURL(Services.urlFormatter.formatURLPref("plugins.update.url"));
-  },
-
   // Callback for user clicking a "reload page" link
   reloadPage: function(browser) {
     browser.reload();
@@ -524,10 +518,7 @@ var gPluginHandler = {
       }
 
       let url;
-      // TODO: allow the blocklist to specify a better link, bug 873093
-      if (pluginInfo.blocklistState == Ci.nsIBlocklistService.STATE_VULNERABLE_UPDATE_AVAILABLE) {
-        url = Services.urlFormatter.formatURLPref("plugins.update.url");
-      } else if (pluginInfo.blocklistState != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
+      if (pluginInfo.blocklistState != Ci.nsIBlocklistService.STATE_NOT_BLOCKED) {
         url = Services.blocklist.getPluginBlocklistURL(pluginInfo.pluginTag);
       }
       pluginInfo.detailsLink = url;
diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index 18f43c029..e9bd01923 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -54,9 +54,6 @@ XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() {
   return Services.strings.createBundle('chrome://browser/locale/browser.properties');
 });
 
-const PREF_PLUGINS_NOTIFYUSER = "plugins.update.notifyUser";
-const PREF_PLUGINS_UPDATEURL  = "plugins.update.url";
-
 // 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.
 const BOOKMARKS_BACKUP_IDLE_TIME = 15 * 60;
@@ -977,21 +974,6 @@ BrowserGlue.prototype = {
     }
   },
 
-  _showPluginUpdatePage: function() {
-    // Pale Moon: disable this functionality from BrowserGlue, people are 
-    // already notified if they visit a page with an outdated plugin, and
-    // they can check properly from the plugins page as well. 
-
-//    Services.prefs.setBoolPref(PREF_PLUGINS_NOTIFYUSER, false);
-//
-//    var formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].
-//                    getService(Ci.nsIURLFormatter);
-//    var updateUrl = formatter.formatURLPref(PREF_PLUGINS_UPDATEURL);
-//
-//    var win = this.getMostRecentBrowserWindow();
-//    win.openUILinkIn(updateUrl, "tab");
-  },
-
   /**
    * Initialize Places
    * - imports the bookmarks html file if bookmarks database is empty, try to