diff options
| author | Tomas Touceda <chiiph@leap.se> | 2013-06-19 15:05:22 -0300 |
|---|---|---|
| committer | Tomas Touceda <chiiph@leap.se> | 2013-06-19 15:05:22 -0300 |
| commit | 5da08919eee9f8f1579e90016e11b0a55ec323af (patch) | |
| tree | 7b456017c112d0a1ccc91b39ea88d7ef2654b568 /src | |
| parent | 898ac3c5d316a77f36a6fdaeb84a5e7044c43c23 (diff) | |
| parent | e699db4377d1b79c0c48eb3c753d373e44cceb13 (diff) | |
Merge remote-tracking branch 'ivan/bug/2932_comment-out-soledad' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index cf20c6eb..a5d022e9 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -42,7 +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 -from leap.services.soledad.soledadbootstrapper import SoledadBootstrapper +# XXX: comment out soledad temporarily to avoid problem 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 from leap.platform_init.initializers import init_platform |