4 files changed, 1 insertions, 134 deletions
diff --git a/chrome/content/accountWizard/launchAccountWizard.js b/chrome/content/accountWizard/launchAccountWizard.js
index bda743f..dc8e9ea 100644
--- a/chrome/content/accountWizard/launchAccountWizard.js
+++ b/chrome/content/accountWizard/launchAccountWizard.js
@@ -1,5 +1,5 @@
 /**
- * statusBar.js
+ * launchAccountWizard.js
  * Copyright (C) 2013 LEAP
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/chrome/content/statusBar/statusBarOverlay.js b/chrome/content/statusBar/statusBarOverlay.js
deleted file mode 100644
index fbe91bb..0000000
--- a/chrome/content/statusBar/statusBarOverlay.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * statusBar.js
- * Copyright (C) 2013 LEAP
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along
- */
-
-
-Components.utils.import("resource:///modules/mailServices.js");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-var accountNotConfigured = getStringBundle(
-    "chrome://bitmask/locale/statusBar.properties")
-        .GetStringFromName("account_not_configured");
-var accountConfigured = getStringBundle(
-    "chrome://bitmask/locale/statusBar.properties")
-        .GetStringFromName("account_configured");
-
-
-/*****************************************************************************
- * Schedule initialization and update functions.
- ****************************************************************************/
-
-// run startUp() once when window loads
-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
-
-
-/*****************************************************************************
- * GUI maintenance functions.
- ****************************************************************************/
-
-function starUp() {
-    // TODO: uncomment when we want messages in the status bar again.
-    //updatePanel();
-    if (!isBitmaskAccountConfigured()) {
-        launchAccountWizard();
-    } else {
-        var server = getBitmaskServer();
-        // TODO: add an alert that there exists a bitmask account with caching
-        // enabled.
-        //if (server.offlineDownload == true)
-        //    alertPrompt('WARNING!');
-    }
-}
-
-/**
- * Update the status bar panel with information about bitmask accounts.
- */
-function updatePanel() {
-    var statusBarPanel = document.getElementById("bitmask-status-bar");
-    if (isBitmaskAccountConfigured())
-        statusBarPanel.label = accountConfigured;
-    else
-        statusBarPanel.label = accountNotConfigured;
-}
-
-/**
- * Handle a click on the status bar panel. For now, just launch the new
- * account wizard if there's no account configured.
- */
-function handleStatusBarClick() {
-    if (!isBitmaskAccountConfigured())
-        launchAccountWizard();
-}
-
-
-/*****************************************************************************
- * Account management functions
- ****************************************************************************/
-
-/**
- * Return true if there exists an account with incoming server hostname equal
- * to IMAP_HOST and port equal to IMAP_PORT.
- *
- * TODO: also verify for SMTP configuration?
- */
-function isBitmaskAccountConfigured() {
-    return !!getBitmaskServer();
-}
-
-/**
- * Get a configured bitmask account
- */
-function getBitmaskServer() {
-    var accountManager = Cc["@mozilla.org/messenger/account-manager;1"]
-                         .getService(Ci.nsIMsgAccountManager);
-    return accountManager.findRealServer(
-        "", IMAP_HOST, "imap", IMAP_PORT);
-}
diff --git a/chrome/content/statusBar/statusBarOverlay.xul b/chrome/content/statusBar/statusBarOverlay.xul
deleted file mode 100644
index 4557a14..0000000
--- a/chrome/content/statusBar/statusBarOverlay.xul
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<overlay id="bitmaskStatusBarOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript"
-          src="chrome://bitmask/content/util.js"/>
-  <script type="application/javascript"
-          src="chrome://bitmask/content/serverConfig.js"/>
-  <script type="application/javascript"
-          src="chrome://bitmask/content/accountWizard/bitmaskAccountManagerOverlay.js"/>
-  <script type="application/javascript"
-          src="chrome://bitmask/content/statusBar/statusBarOverlay.js"/>
-  <statusbar id="status-bar">
-    <!-- We don't want messages in status bar for now (#4871) -->
-    <!--<statusbarpanel id="bitmask-status-bar"
-                    label="Bitmask"
-                    onclick="handleStatusBarClick();" />-->
-  </statusbar>
-</overlay>
diff --git a/chrome/locale/en-US/statusBar.properties b/chrome/locale/en-US/statusBar.properties
deleted file mode 100644
index 7715c71..0000000
--- a/chrome/locale/en-US/statusBar.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# statusBar.js
-account_not_configured=Click to config Bitmask account
-account_configured=Bitmask account is configured!