summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-08-01 11:01:16 +0200
committerKali Kaneko <kali@leap.se>2013-08-01 11:01:16 +0200
commit8f3e7332e3fa0b7245eba878456f93a2e11ecbbf (patch)
treedd64e1c2d43b6c59b99a53a8938f769299adecfc /src/leap/gui
parentb39584175fda25d812dbb90d3fa171f7a50e3914 (diff)
parent6f11db8234a7236f6dce0c4611dffa3068dc5036 (diff)
Merge branch 'reintegrate-soledad' into develop
Diffstat (limited to 'src/leap/gui')
-rw-r--r--src/leap/gui/mainwindow.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index f333d7ec..1c871aa2 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -42,8 +42,8 @@ from leap.gui.statuspanel import StatusPanelWidget
from leap.services.eip.eipbootstrapper import EIPBootstrapper
from leap.services.eip.eipconfig import EIPConfig
from leap.services.eip.providerbootstrapper import ProviderBootstrapper
-# XXX: comment out soledad temporarily to avoid problem in Windows, issue #2932
-# from leap.services.soledad.soledadbootstrapper import SoledadBootstrapper
+# XXX: Soledad might not work out of the box in Windows, issue #2932
+from leap.services.soledad.soledadbootstrapper import SoledadBootstrapper
from leap.services.mail.smtpbootstrapper import SMTPBootstrapper
from leap.platform_init import IS_WIN, IS_MAC
from leap.platform_init.initializers import init_platform
@@ -199,11 +199,11 @@ class MainWindow(QtGui.QMainWindow):
self._eip_bootstrapper.download_client_certificate.connect(
self._finish_eip_bootstrap)
- #self._soledad_bootstrapper = SoledadBootstrapper()
- #self._soledad_bootstrapper.download_config.connect(
- #self._soledad_intermediate_stage)
- #self._soledad_bootstrapper.gen_key.connect(
- #self._soledad_bootstrapped_stage)
+ self._soledad_bootstrapper = SoledadBootstrapper()
+ self._soledad_bootstrapper.download_config.connect(
+ self._soledad_intermediate_stage)
+ self._soledad_bootstrapper.gen_key.connect(
+ self._soledad_bootstrapped_stage)
self._smtp_bootstrapper = SMTPBootstrapper()
self._smtp_bootstrapper.download_config.connect(
@@ -867,11 +867,11 @@ class MainWindow(QtGui.QMainWindow):
self.ui.stackedWidget.setCurrentIndex(self.EIP_STATUS_INDEX)
# XXX disabling soledad for now
- #self._soledad_bootstrapper.run_soledad_setup_checks(
- #self._provider_config,
- #self._login_widget.get_user(),
- #self._login_widget.get_password(),
- #download_if_needed=True)
+ self._soledad_bootstrapper.run_soledad_setup_checks(
+ self._provider_config,
+ self._login_widget.get_user(),
+ self._login_widget.get_password(),
+ download_if_needed=True)
self._download_eip_config()