diff options
| author | kali <kali@leap.se> | 2013-06-15 01:28:59 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2013-06-15 01:31:11 +0900 |
| commit | e6a181c13e8bf99a893b3e3881c13d2df23701a7 (patch) | |
| tree | aced8cb3ba7b9d6db54740fbaf327144008b22b9 /src/leap/gui | |
| parent | 561e7bc90f21efe5f86be7a842c283f4b7fa7610 (diff) | |
| parent | 8bee5f4e9a1bb0f7069fe41ab37dfec000487d7b (diff) | |
Merge remote-tracking branch 'chiiph/bug/true_threading' into develop
Closes #2848
Diffstat (limited to 'src/leap/gui')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 3 | ||||
| -rw-r--r-- | src/leap/gui/statuspanel.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 90e74823..a5905679 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -1150,7 +1150,8 @@ class MainWindow(QtGui.QMainWindow): """ passed = data[self._provider_bootstrapper.PASSED_KEY] if not passed: - self._set_status(data[self._provider_bootstrapper.ERROR_KEY]) + self._login_widget.set_status( + data[self._provider_bootstrapper.ERROR_KEY]) self._already_started_eip = False def _eip_finished(self, exitCode): diff --git a/src/leap/gui/statuspanel.py b/src/leap/gui/statuspanel.py index 53c19e86..554903d8 100644 --- a/src/leap/gui/statuspanel.py +++ b/src/leap/gui/statuspanel.py @@ -189,7 +189,7 @@ class StatusPanelWidget(QtGui.QWidget): "it's already " "running."))) else: - self._set_eip_status(status) + self.set_eip_status(status) def set_eip_status_icon(self, status): """ |