issue #1155 - Don't allow displaying icon text with Australis theme

lib/main.js

Index: lib/main.js
===================================================================
--- a/lib/main.js
+++ b/lib/main.js
@@ -9,6 +9,13 @@
 let {Prefs} = require("prefs");
 let {WindowObserver} = require("windowObserver");
 
+var isAustralis = false;
+try
+{
+  Cu.import("resource:///modules/CustomizableUI.jsm", null);
+  isAustralis = true;
+} catch(e) {}
+
 var WindowFeature =
 {
   observer: null,
@@ -124,6 +131,12 @@
   stylesheet: "chrome://abpcustomization/content/noActionButton.css"
 };
 
+var AddonPageAustralisStyles =
+{
+  __proto__: StylesheetFeature,
+  stylesheet: "chrome://abpcustomization/content/addonPageAustralisStyles.css"
+};
+
 var ToolbarIconDisplay =
 {
   __proto__: StylesheetFeature,
@@ -172,6 +185,7 @@
   "preferences-one-line-subscriptions": OneLineSubscriptions,
   "preferences-remove-actions-button": RemoveActionsButton,
   "toolbar-icon-display": ToolbarIconDisplay,
+  "addon-page-australis-styles": AddonPageAustralisStyles,
   "green-icon": GreenIcon,
   "remove-menus": RemoveMenus
 };
@@ -183,6 +197,10 @@
     let enabled;
     if (name == "addon-page-styles")
       enabled = true;
+    else if (name == "toolbar-icon-display" && isAustralis)
+      enabled = false;
+    else if (name == "addon-page-australis-styles")
+      enabled = isAustralis;
     else
       enabled = Prefs[name];
 
@@ -193,7 +211,6 @@
   }
 }
 
-
 // Initialize features and make sure to update them on changes
 for (let feature in features)
   updateFeature(feature);