diff options
| author | kali <kali@katsi> | 2014-07-25 11:39:19 -0500 |
|---|---|---|
| committer | kali <kali@katsi> | 2014-07-25 11:39:19 -0500 |
| commit | c4832d322c6ab71edab14643a77d9f1bd099a458 (patch) | |
| tree | 52717110f5ba4bfefe56ee5c2f0ad9f6ac7cc31e /src/leap/bitmask/gui | |
| parent | 675e4ed10f173088423bf07e3f0ba651cdb8b13c (diff) | |
| parent | dbfcb48a5d4d3aee80ed8dd7b20e61994ddbb667 (diff) | |
Merge tag '0.5.4' into deb-0.5.4
Tag leap.bitmask version 0.5.4
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/login.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py index f66e71d9..baf29c23 100644 --- a/src/leap/bitmask/gui/login.py +++ b/src/leap/bitmask/gui/login.py @@ -216,7 +216,8 @@ class LoginWidget(QtGui.QWidget): """ self.ui.lnUser.setEnabled(enabled) self.ui.lnPassword.setEnabled(enabled) - self.ui.chkRemember.setEnabled(enabled) + if has_keyring(): + self.ui.chkRemember.setEnabled(enabled) self.ui.cmbProviders.setEnabled(enabled) self._set_cancel(not enabled) diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 8a5b8275..a7e35d15 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -960,6 +960,12 @@ class MainWindow(QtGui.QMainWindow): if not visible: QtGui.QApplication.setQuitOnLastWindowClosed(True) self.show() + if IS_LINUX: + # On ubuntu, activateWindow doesn't work reliably, so + # we do the following as a workaround. See + # https://bugreports.qt-project.org/browse/QTBUG-24932 + # for more details + QtGui.QX11Info.setAppUserTime(0) self.activateWindow() self.raise_() else: |