summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-10-26 00:18:06 +0900
committerkali <kali@leap.se>2012-10-26 00:18:06 +0900
commitb847bbfb8e1fed3dd478a0314ed618b6a1ae8cb6 (patch)
tree108ae315250a94a84cfbd1c1f1f2c33db71b430f /src
parent0590991d7777de473a7df21ed32e1fa7caa9cf4b (diff)
save user/pass only if save_user checked in wizard
Diffstat (limited to 'src')
-rwxr-xr-xsrc/leap/gui/firstrunwizard.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/leap/gui/firstrunwizard.py b/src/leap/gui/firstrunwizard.py
index 4cad9c3f..fd49380c 100755
--- a/src/leap/gui/firstrunwizard.py
+++ b/src/leap/gui/firstrunwizard.py
@@ -195,7 +195,7 @@ class FirstRunWizard(QtGui.QWizard):
# username and password are in different fields
# if they were stored in log_in or sign_up pages.
- from_login = self.wizard().from_login
+ from_login = self.from_login
unamek_base = 'userName'
passwk_base = 'userPassword'
unamek = 'login_%s' % unamek_base if from_login else unamek_base
@@ -221,16 +221,17 @@ class FirstRunWizard(QtGui.QWizard):
settings.setValue("provider_domain", provider)
full_username = "%s@%s" % (username, provider)
- settings.setValue("eip_username", full_username)
settings.setValue("remember_user_and_pass", remember_pass)
- seed = self.get_random_str(10)
- settings.setValue("%s_seed" % provider, seed)
+ if remember_pass:
+ settings.setValue("eip_username", full_username)
+ seed = self.get_random_str(10)
+ settings.setValue("%s_seed" % provider, seed)
- # XXX #744: comment out for 0.2.0 release
- # if we need to have a version of python-keyring < 0.9
- leapkeyring.leap_set_password(
- full_username, password, seed=seed)
+ # XXX #744: comment out for 0.2.0 release
+ # if we need to have a version of python-keyring < 0.9
+ leapkeyring.leap_set_password(
+ full_username, password, seed=seed)
logger.debug('First Run Wizard Done.')
cb = self.success_cb