diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/eip/checks.py | 2 | ||||
| -rwxr-xr-x | src/leap/gui/firstrunwizard.py | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/leap/eip/checks.py b/src/leap/eip/checks.py index 1c29dab1..74afd677 100644 --- a/src/leap/eip/checks.py +++ b/src/leap/eip/checks.py @@ -164,7 +164,7 @@ class ProviderCertChecker(object): raise eipexceptions.HttpsNotSupported except requests.exceptions.SSLError as exc: - logger.warning('False! CERT VERIFICATION FAILED! ' + logger.warning('BUG #638 CERT VERIFICATION FAILED! ' '(this should be CRITICAL)') logger.warning('SSLError: %s', exc.message) # XXX RAISE! See #638 diff --git a/src/leap/gui/firstrunwizard.py b/src/leap/gui/firstrunwizard.py index 55338090..8bb40cdc 100755 --- a/src/leap/gui/firstrunwizard.py +++ b/src/leap/gui/firstrunwizard.py @@ -713,14 +713,11 @@ class LogInPage(QtGui.QWizardPage, UserFormMixIn): validationMsg = QtGui.QLabel("") validationMsg.setStyleSheet(ErrorLabelStyleSheet) - self.validationMsg = validationMsg layout.addWidget(validationMsg, 0, 3) - layout.addWidget(userNameLabel, 1, 0) layout.addWidget(self.userNameLineEdit, 1, 3) - layout.addWidget(userPasswordLabel, 2, 0) layout.addWidget(self.userPasswordLineEdit, 2, 3) @@ -788,13 +785,10 @@ class RegisterUserPage(QtGui.QWizardPage, UserFormMixIn): self.validationMsg = validationMsg layout.addWidget(validationMsg, 0, 3) - layout.addWidget(userNameLabel, 1, 0) layout.addWidget(self.userNameLineEdit, 1, 3) - layout.addWidget(userPasswordLabel, 2, 0) layout.addWidget(self.userPasswordLineEdit, 2, 3) - layout.addWidget(rememberPasswordCheckBox, 3, 3, 3, 4) self.setLayout(layout) @@ -834,9 +828,11 @@ class RegisterUserPage(QtGui.QWizardPage, UserFormMixIn): # XXX enforce https # and pass a verify value + domain = self.field('provider_domain') + signup = LeapSRPRegister( schema="http", - provider="springbok", + provider=domain, # debug ----- #provider="localhost", @@ -942,6 +938,6 @@ if __name__ == '__main__': logger.setLevel(logging.DEBUG) app = QtGui.QApplication(sys.argv) - wizard = FirstRunWizard(providers=('springbok',)) + wizard = FirstRunWizard() # providers=('springbok',)) wizard.show() sys.exit(app.exec_()) |