2 files changed, 15 insertions, 9 deletions
diff --git a/chrome/content/statusBar/statusBarOverlay.js b/chrome/content/statusBar/statusBarOverlay.js
index c82b3f2..fbe91bb 100644
--- a/chrome/content/statusBar/statusBarOverlay.js
+++ b/chrome/content/statusBar/statusBarOverlay.js
@@ -33,15 +33,19 @@ var accountConfigured = getStringBundle(
  ****************************************************************************/
 
 // run startUp() once when window loads
-window.addEventListener("load", function(e) { 
-	starUp(); 
+window.addEventListener("load", function(e) {
+	starUp();
 }, false);
 
+/**
+ * We don't want a message with the bitmask account status in the status bar
+ * for now (see https://leap.se/code/issues/4871).
+ */
 // run updatePanel() periodically
-window.setInterval(
-	function() {
-		updatePanel(); 
-	}, 10000); // update every ten seconds
+//window.setInterval(
+//	function() {
+//		updatePanel();
+//	}, 10000); // update every ten seconds
 
 
 /*****************************************************************************
@@ -49,7 +53,8 @@ window.setInterval(
  ****************************************************************************/
 
 function starUp() {
-    updatePanel();
+    // TODO: uncomment when we want messages in the status bar again.
+    //updatePanel();
     if (!isBitmaskAccountConfigured()) {
         launchAccountWizard();
     } else {
diff --git a/chrome/content/statusBar/statusBarOverlay.xul b/chrome/content/statusBar/statusBarOverlay.xul
index 006ccb9..4557a14 100644
--- a/chrome/content/statusBar/statusBarOverlay.xul
+++ b/chrome/content/statusBar/statusBarOverlay.xul
@@ -10,8 +10,9 @@
   <script type="application/javascript"
           src="chrome://bitmask/content/statusBar/statusBarOverlay.js"/>
   <statusbar id="status-bar">
-    <statusbarpanel id="bitmask-status-bar"
+    <!-- We don't want messages in status bar for now (#4871) -->
+    <!--<statusbarpanel id="bitmask-status-bar"
                     label="Bitmask"
-                    onclick="handleStatusBarClick();" />
+                    onclick="handleStatusBarClick();" />-->
   </statusbar>
 </overlay>