diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-07-02 10:52:45 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-07-02 10:52:45 -0300 |
| commit | 3364a21d2f38a4d09259221ceef9ab1a48f205f5 (patch) | |
| tree | b15bce0ed60051c3f3f4c0a903a796435a5d79df /src | |
| parent | 7a86fe5719984ba0656628d4ab74734009065f3c (diff) | |
| parent | e0858fffc72379ffff818ce2d5b0a3994e6da324 (diff) | |
Merge remote-tracking branch 'ivan/bug/2955_fix_remember_me' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/gui/mainwindow.py | 1 | ||||
| -rw-r--r-- | src/leap/util/keyring_helpers.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py index 0382f334..5e7965dd 100644 --- a/src/leap/gui/mainwindow.py +++ b/src/leap/gui/mainwindow.py @@ -439,7 +439,6 @@ class MainWindow(QtGui.QMainWindow): self._login_widget.set_user(possible_username) if possible_password is not None: self._login_widget.set_password(possible_password) - self._login_widget.set_remember(has_keyring()) self._login() self._wizard = None self._settings.set_properprovider(True) diff --git a/src/leap/util/keyring_helpers.py b/src/leap/util/keyring_helpers.py index b815d385..8f354f28 100644 --- a/src/leap/util/keyring_helpers.py +++ b/src/leap/util/keyring_helpers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# privilege_policies.py +# keyring_helpers.py # Copyright (C) 2013 LEAP # # This program is free software: you can redistribute it and/or modify @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. """ - +Keyring helpers. """ import keyring @@ -29,7 +29,9 @@ OBSOLETE_KEYRINGS = [ def has_keyring(): """ + Returns whether we have an useful keyring to use. + :rtype: bool """ kr = keyring.get_keyring() return kr is not None and kr.__class__ not in OBSOLETE_KEYRINGS |