diff options
| author | Kali Kaneko <kali@leap.se> | 2015-02-11 14:06:53 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-02-11 14:06:53 -0400 |
| commit | 0c52d5d8b4ec9c01c5308c8e9de329879d7d3027 (patch) | |
| tree | 40ccbf608214aab028283a13be0914378207329d /src/leap/bitmask/gui | |
| parent | 91f0a38f5911d0f26210f62a94ab46e741e30189 (diff) | |
| parent | 965d8a6bd4646fe6cc285e18355bbe2ce514b73b (diff) | |
Merge branch 'feature/async-api' into develop
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index f5983abb..bf61a6ba 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1191,9 +1191,13 @@ class MainWindow(QtGui.QMainWindow, SignalTracker): self._disconnect_login_wait() user = self._login_widget.get_logged_user() - domain = self._providers.get_selected_provider() - full_user_id = make_address(user, domain) - self._mail_conductor.userid = full_user_id + # XXX the widget now gives us the full user id. + # this is confusing. + #domain = self._providers.get_selected_provider() + #full_user_id = make_address(user, domain) + # XXX the casting to str (needed by smtp gateway) should be done + # in a better place. + self._mail_conductor.userid = str(user) self._start_eip_bootstrap() self.ui.action_create_new_account.setEnabled(True) |