diff options
| author | Kali Kaneko <kali@leap.se> | 2013-08-05 03:46:36 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-08-05 03:46:36 +0200 |
| commit | bb01912dd4dfe05f16d1c2fa716346ca358f5d04 (patch) | |
| tree | b3a910bcb586f3af964afaa5e61f75a4701df11f /src/leap/gui | |
| parent | d2d13cf61adf51895d45556ab0b08115ea2eeb1c (diff) | |
| parent | dbb8b11eab30d495492bd7f65430fb9c25e3a276 (diff) | |
Merge remote-tracking branch 'chiiph/feature/re-integrate-smtp' into develop
Diffstat (limited to 'src/leap/gui')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 395b9329..8e7e2488 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -982,12 +982,14 @@ class MainWindow(QtGui.QMainWindow): # TODO: Make the encrypted_only configurable from leap.mail.smtp import setup_smtp_relay + client_cert = self._eip_config.get_client_cert_path( + self._provider_config) setup_smtp_relay(port=1234, keymanager=self._keymanager, smtp_host=host, smtp_port=port, - smtp_username=".", - smtp_password=".", + smtp_cert=client_cert, + smtp_key=client_cert, encrypted_only=False) def _get_socket_host(self): |