diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-07-31 14:52:06 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2014-07-31 14:52:06 -0300 |
| commit | 429cc2681e74785e3e88b270730e246f3f9f3ce7 (patch) | |
| tree | 8aa9f8a1a9c1f77098337442eac77d52c720b214 /src/leap/bitmask | |
| parent | 87869ff34efce43a331d238db64b768b616b129a (diff) | |
| parent | 75eddcf502d23f761cbac26da34fcfd1ab669b8b (diff) | |
Merge remote-tracking branch 'chiiph/bug/properly_enable_keyring' into develop
Diffstat (limited to 'src/leap/bitmask')
| -rw-r--r-- | src/leap/bitmask/gui/login.py | 3 | ||||
| -rw-r--r-- | src/leap/bitmask/util/keyring_helpers.py | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/login.py b/src/leap/bitmask/gui/login.py index baf29c23..8e0a3a15 100644 --- a/src/leap/bitmask/gui/login.py +++ b/src/leap/bitmask/gui/login.py @@ -216,8 +216,7 @@ class LoginWidget(QtGui.QWidget): """ self.ui.lnUser.setEnabled(enabled) self.ui.lnPassword.setEnabled(enabled) - if has_keyring(): - self.ui.chkRemember.setEnabled(enabled) + self.ui.chkRemember.setEnabled(enabled and has_keyring()) self.ui.cmbProviders.setEnabled(enabled) self._set_cancel(not enabled) diff --git a/src/leap/bitmask/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py index 0512d988..088e7b3d 100644 --- a/src/leap/bitmask/util/keyring_helpers.py +++ b/src/leap/bitmask/util/keyring_helpers.py @@ -34,10 +34,6 @@ except Exception: # dbus socket, or stuff like that. keyring = None -# XXX remember password disabled right now! -# see: https://leap.se/code/issues/4190 -keyring = None - logger = logging.getLogger(__name__) |