diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-04 17:08:55 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-04 17:08:55 +0200 |
| commit | d0afef400e3259b9b1d8acb7f53ee1eda380e9c0 (patch) | |
| tree | dd6cd8a44310fa84aeebc7f4957b06fad8800f74 | |
| parent | e7a36da5aaa1924943d5f42a915b2ea4d4b8a70f (diff) | |
| parent | aae5eb050d6c5f8f4559ee33e231382421d1a569 (diff) | |
Merge remote-tracking branch 'ivan-github/bug/3582_set-appropiate-message-on-login-cancel' into develop
| -rw-r--r-- | changes/bug-3582_set-appropiate-message-on-login-cancel | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/changes/bug-3582_set-appropiate-message-on-login-cancel b/changes/bug-3582_set-appropiate-message-on-login-cancel new file mode 100644 index 00000000..3ad11490 --- /dev/null +++ b/changes/bug-3582_set-appropiate-message-on-login-cancel @@ -0,0 +1 @@ + o Set appropiate error on login cancel. Closes #3582. diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 7a94fd0f..759a591b 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -891,6 +891,8 @@ class MainWindow(QtGui.QMainWindow): logger.debug("Cancelling login defer.") self._login_defer.cancel() + self._login_widget.set_status(self.tr("Log in cancelled by the user.")) + def _provider_config_loaded(self, data): """ SLOT |