summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-13 18:19:59 +0200
committerKali Kaneko <kali@leap.se>2013-08-13 18:19:59 +0200
commit10f937feffeb2e267a6426cdd5d3287783da866d (patch)
tree55032d614e6fc18dfa7009b5328247ebc329a038
parent143a08dd1cc8eeb9d92a1d981f8a13fb3e4c966d (diff)
parent4e5c8b32a7fde365a7535cf440d24ae8853140d3 (diff)
Merge remote-tracking branch 'chiiph/bug/disable_mail' into develop
-rw-r--r--changes/bug_disablemail_completely2
-rw-r--r--src/leap/bitmask/gui/mainwindow.py23
2 files changed, 21 insertions, 4 deletions
diff --git a/changes/bug_disablemail_completely b/changes/bug_disablemail_completely
new file mode 100644
index 00000000..126da2a7
--- /dev/null
+++ b/changes/bug_disablemail_completely
@@ -0,0 +1,2 @@
+ o Do not start IMAP daemon if mail was not selected among the
+ services. Fixes #3435. \ No newline at end of file
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py
index 46def802..b624988f 100644
--- a/src/leap/bitmask/gui/mainwindow.py
+++ b/src/leap/bitmask/gui/mainwindow.py
@@ -1054,11 +1054,26 @@ class MainWindow(QtGui.QMainWindow):
TRIGGERS:
soledad_ready
"""
- logger.debug('Starting imap service')
+ if self._provider_config.provides_mx() and \
+ self._enabled_services.count(self.MX_SERVICE) > 0:
+ logger.debug('Starting imap service')
+
+ self._imap_service = imap.start_imap_service(
+ self._soledad,
+ self._keymanager)
+ else:
+ if self._enabled_services.count(self.MX_SERVICE) > 0:
+ pass # TODO: show MX status
+ #self._status_panel.set_eip_status(
+ # self.tr("%s does not support MX") %
+ # (self._provider_config.get_domain(),),
+ # error=True)
+ else:
+ pass # TODO: show MX status
+ #self._status_panel.set_eip_status(
+ # self.tr("MX is disabled"))
+
- self._imap_service = imap.start_imap_service(
- self._soledad,
- self._keymanager)
def _get_socket_host(self):
"""