diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-08 15:51:09 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-08-08 15:51:09 -0300 |
| commit | 782bfa2572f6b0872943dc8f1d240fcd4f65d797 (patch) | |
| tree | 319dfaa3d59cfdb655d89a7f35dc5ec979691a05 /src/leap/gui | |
| parent | a6b994f9c201428097676fe914b55d50dfb07db7 (diff) | |
| parent | 27a059b28be9b05995b74b968d509c3cea19b72c (diff) | |
Merge remote-tracking branch 'chiiph/bug/set_gpg_path' into develop
Diffstat (limited to 'src/leap/gui')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 90492e45..463ba2c4 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -927,7 +927,8 @@ class MainWindow(QtGui.QMainWindow): self._provider_config, self._login_widget.get_user(), self._login_widget.get_password(), - download_if_needed=True) + download_if_needed=True, + stanalone=self._standalone) self._download_eip_config() @@ -1033,7 +1034,7 @@ class MainWindow(QtGui.QMainWindow): 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, + setup_smtp_relay(port=2013, keymanager=self._keymanager, smtp_host=host, smtp_port=port, |