summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-07-31 14:45:43 -0300
committerTomás Touceda <chiiph@leap.se>2014-07-31 14:45:43 -0300
commit75eddcf502d23f761cbac26da34fcfd1ab669b8b (patch)
tree8aa9f8a1a9c1f77098337442eac77d52c720b214 /src/leap
parent87869ff34efce43a331d238db64b768b616b129a (diff)
Enable keyring again
Diffstat (limited to 'src/leap')
-rw-r--r--src/leap/bitmask/gui/login.py3
-rw-r--r--src/leap/bitmask/util/keyring_helpers.py4
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__)