From d21b46fc9c9278bc0529fe8736d2c9e91dee75bc Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Thu, 19 Mar 2020 06:36:18 +0100
Subject: Revert "Issue #1445 - Clarify the status of extensions in the Add-On
 manager"

This reverts commit f107de8a9051489a7cb786ff0106d8f3ab046ca8.
---
 toolkit/mozapps/extensions/content/extensions.js  |  9 ---------
 toolkit/mozapps/extensions/content/extensions.xml | 14 +++-----------
 2 files changed, 3 insertions(+), 20 deletions(-)

(limited to 'toolkit/mozapps')

diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js
index 782fca303..9576e9a3b 100644
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -3059,15 +3059,6 @@ var gDetailView = {
         warning.textContent =
           gStrings.ext.formatStringFromName("details.notification.gmpPending",
                                             [this._addon.name], 1);
-#ifdef MOZ_PHOENIX_EXTENSIONS
-      } else if (this._addon.native == false) {
-        this.node.setAttribute("notification", "warning");
-        this.node.setAttribute("native", "false");
-        document.getElementById("detail-warning").textContent = gStrings.ext.formatStringFromName(
-          "details.notification.compatibility",
-          [this._addon.name, gStrings.brandShortName], 2
-        );
-#endif
       } else {
         this.node.removeAttribute("notification");
       }
diff --git a/toolkit/mozapps/extensions/content/extensions.xml b/toolkit/mozapps/extensions/content/extensions.xml
index 513807e78..9c8fda8ed 100644
--- a/toolkit/mozapps/extensions/content/extensions.xml
+++ b/toolkit/mozapps/extensions/content/extensions.xml
@@ -858,8 +858,8 @@
                            xbl:inherits="value=name,tooltiptext=name"/>
                 <xul:label anonid="version" class="version"/>
 #ifdef MOZ_PHOENIX_EXTENSIONS
-                <xul:label class="nativeIndicator nativeAddon" value="" tooltiptext="&addon.nativeAddon;"/>
-                <xul:label class="nativeIndicator compatAddon" value="⚠️" tooltiptext="&addon.compatAddon;"/>
+                <xul:label class="nativeIndicator nativeAddon" value="●" tooltiptext="&addon.nativeAddon;"/>
+                <xul:label class="nativeIndicator compatAddon" value="●" tooltiptext="&addon.compatAddon;"/>
 #endif
                 <xul:label class="disabled-postfix" value="&addon.disabled.postfix;"/>
                 <xul:label class="update-postfix" value="&addon.update.postfix;"/>
@@ -1359,16 +1359,8 @@
             } else {
               this.removeAttribute("notification");
 #ifdef MOZ_PHOENIX_EXTENSIONS
-              if (this.mAddon.type == "extension") {
+              if (this.mAddon.type == "extension")
                 this.setAttribute("native", this.mAddon.native);
-                if (this.mAddon.native == false) {
-                  this.setAttribute("notification", "warning");
-                  this._warning.textContent = gStrings.ext.formatStringFromName(
-                    "notification.compatibility",
-                    [this.mAddon.name, gStrings.brandShortName], 2
-                  );
-                }
-              }
 #endif
             }
           }
-- 
cgit v1.2.3