diff options
| author | Kali Kaneko <kali@leap.se> | 2013-06-23 23:53:13 +0900 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-06-23 23:53:13 +0900 |
| commit | 53668de6f4ced844b10fc34fbc5ba77b00d54825 (patch) | |
| tree | 3d6be7573fcef2538aa59101250aff28a4921dbd /src/leap/gui/wizard.py | |
| parent | b777dbfd4df7f4f0e4c2596fcc4000c2aba05a08 (diff) | |
| parent | 440f2036e36985e9536644b28af0e62cea8704eb (diff) | |
Merge remote-tracking branch 'chiiph/bug/disable_bad_keyring' into develop
Diffstat (limited to 'src/leap/gui/wizard.py')
| -rw-r--r-- | src/leap/gui/wizard.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/leap/gui/wizard.py b/src/leap/gui/wizard.py index 066a7db3..34eba84c 100644 --- a/src/leap/gui/wizard.py +++ b/src/leap/gui/wizard.py @@ -31,6 +31,7 @@ from leap.config.providerconfig import ProviderConfig from leap.crypto.srpregister import SRPRegister from leap.util.privilege_policies import is_missing_policy_permissions from leap.util.request_helpers import get_content +from leap.util.keyring_helpers import has_keyring from leap.services.eip.providerbootstrapper import ProviderBootstrapper from leap.services import get_available @@ -170,7 +171,7 @@ class Wizard(QtGui.QWizard): return self._password def get_remember(self): - return self.ui.chkRemember.isChecked() + return has_keyring() and self.ui.chkRemember.isChecked() def get_services(self): return self._selected_services @@ -286,8 +287,9 @@ class Wizard(QtGui.QWizard): self._set_registration_fields_visibility(False) # Allow the user to remember his password - self.ui.chkRemember.setVisible(True) - self.ui.chkRemember.setEnabled(True) + if has_keyring(): + self.ui.chkRemember.setVisible(True) + self.ui.chkRemember.setEnabled(True) self.page(self.REGISTER_USER_PAGE).set_completed() self.button(QtGui.QWizard.BackButton).setEnabled(False) |