summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug-2955_fix_remember_me1
-rw-r--r--src/leap/gui/mainwindow.py1
-rw-r--r--src/leap/util/keyring_helpers.py6
3 files changed, 5 insertions, 3 deletions
diff --git a/changes/bug-2955_fix_remember_me b/changes/bug-2955_fix_remember_me
new file mode 100644
index 00000000..bfbb6a79
--- /dev/null
+++ b/changes/bug-2955_fix_remember_me
@@ -0,0 +1 @@
+ o Bugfix: Remember should not be automatically set to checked. Closes #2955.
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