X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientauthhandler.cpp;h=4a99890de6f8090f596ab65e8fa792b35f0a6d3a;hp=eeca2cffc8cae998537d7635ef8d03855ceeb353;hb=258d157a228d2b2b46b01d3b33ab932b9979436a;hpb=b49c64970b6237fc95f8ca88c8bb6bcf04c251d7 diff --git a/src/client/clientauthhandler.cpp b/src/client/clientauthhandler.cpp index eeca2cff..4a99890d 100644 --- a/src/client/clientauthhandler.cpp +++ b/src/client/clientauthhandler.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -288,7 +288,7 @@ void ClientAuthHandler::startRegistration() useSsl = _account.useSsl(); #endif - _peer->dispatch(RegisterClient(Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().buildDate, useSsl)); + _peer->dispatch(RegisterClient(Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().commitDate, useSsl)); } @@ -303,6 +303,7 @@ void ClientAuthHandler::handle(const ClientRegistered &msg) { _coreConfigured = msg.coreConfigured; _backendInfo = msg.backendInfo; + _authenticatorInfo = msg.authenticatorInfo; Client::setCoreFeatures(static_cast(msg.coreFeatures)); @@ -321,7 +322,7 @@ void ClientAuthHandler::onConnectionReady() if (!_coreConfigured) { // start wizard - emit startCoreSetup(_backendInfo); + emit startCoreSetup(_backendInfo, _authenticatorInfo); } else // TODO: check if we need LoginEnabled login(); @@ -487,7 +488,7 @@ void ClientAuthHandler::onSslErrors() default: qWarning() << "Certificate digest version" << QString(knownDigestVersion) << "is not supported"; } - + if (knownDigest != calculatedDigest) { bool accepted = false; bool permanently = false;