Remove useless preference and check app ID in second Basilisk branch

the `forceLegacyToolbarButton' preference is useless because on Pale
Moon the button is always added with the "legacy" method, while on
Basilisk it's always added with CustomizableUI, so there is nothing to
"force" here.
Also add a check that was forgotten in the previous commit.

1 files changed, 6 insertions, 6 deletions

diff --git a/js/vapi-background.js b/js/vapi-background.js
index ae933b7..d60ef53 100644
--- a/js/vapi-background.js
+++ b/js/vapi-background.js
@@ -2613,9 +2613,6 @@ vAPI.toolbarButton = {
     if ( Services.vc.compare(Services.appinfo.platformVersion, '36.0') >= 0 ) {
         return null;
     }
-    if ( vAPI.localStorage.getBool('forceLegacyToolbarButton') ) {
-        return null;
-    }
     var CustomizableUI = null;
     try {
         CustomizableUI = Cu.import('resource:///modules/CustomizableUI.jsm', null).CustomizableUI;
@@ -2739,6 +2736,12 @@ vAPI.toolbarButton = {
     // It appears that this branch actually works on the latest
     // Basilisk.  Maybe we can simply use this one directly instead of
     // making checks like it's done now.
+
+    // Add toolbar button for Basilisk
+    if (Services.appinfo.ID !== "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}") {
+	return;
+    }
+    
     var tbb = vAPI.toolbarButton;
     if ( tbb.init !== null ) {
         return;
@@ -2746,9 +2749,6 @@ vAPI.toolbarButton = {
     if ( Services.vc.compare(Services.appinfo.platformVersion, '36.0') < 0 ) {
         return null;
     }
-    if ( vAPI.localStorage.getBool('forceLegacyToolbarButton') ) {
-        return null;
-    }
     var CustomizableUI = null;
     try {
         CustomizableUI = Cu.import('resource:///modules/CustomizableUI.jsm', null).CustomizableUI;