summaryrefslogtreecommitdiff
path: root/src/leap/gui
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-10-11 07:27:57 +0900
committerkali <kali@leap.se>2012-10-11 07:27:57 +0900
commit5dbe01e4dd22fba66d9553c062b89ae9c3a39256 (patch)
tree325a1753bde43170903d95320f3e440c145a3fff /src/leap/gui
parent5c86e71493c433fbee49a3fdc8f8f3a537b3311e (diff)
parenta964b9e55a53b1d87d296e0f3b5295b0366c5967 (diff)
Merge branch 'feature/fix-crypted-keyring' into develop
This is a temporary workaround until we find a good solution to issue #744. Some old versions of python-keyring are causing a recursion loop.
Diffstat (limited to 'src/leap/gui')
-rwxr-xr-xsrc/leap/gui/firstrunwizard.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/leap/gui/firstrunwizard.py b/src/leap/gui/firstrunwizard.py
index 6f2c83ce..a76865fd 100755
--- a/src/leap/gui/firstrunwizard.py
+++ b/src/leap/gui/firstrunwizard.py
@@ -167,7 +167,7 @@ class FirstRunWizard(QtGui.QWizard):
"""
provider = self.get_provider()
username = self.field('userName')
- password = self.field('userPassword')
+ #password = self.field('userPassword')
remember_pass = self.field('rememberPassword')
logger.debug('chosen provider: %s', provider)
@@ -185,7 +185,10 @@ class FirstRunWizard(QtGui.QWizard):
seed = self.get_random_str(10)
settings.setValue("%s_seed" % provider, seed)
- leapkeyring.leap_set_password(username, password, seed=seed)
+ # Commenting out for 0.2.0 release
+ # since we did not fix #744 on time.
+
+ #leapkeyring.leap_set_password(username, password, seed=seed)
logger.debug('First Run Wizard Done.')
cb = self.success_cb