projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate highlight handling
[quassel.git]
/
src
/
client
/
clientauthhandler.cpp
diff --git
a/src/client/clientauthhandler.cpp
b/src/client/clientauthhandler.cpp
index
eeca2cf
..
4a99890
100644
(file)
--- a/
src/client/clientauthhandler.cpp
+++ b/
src/client/clientauthhandler.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
5
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 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
useSsl = _account.useSsl();
#endif
- _peer->dispatch(RegisterClient(Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().
build
Date, useSsl));
+ _peer->dispatch(RegisterClient(Quassel::buildInfo().fancyVersionString, Quassel::buildInfo().
commit
Date, useSsl));
}
}
@@
-303,6
+303,7
@@
void ClientAuthHandler::handle(const ClientRegistered &msg)
{
_coreConfigured = msg.coreConfigured;
_backendInfo = msg.backendInfo;
{
_coreConfigured = msg.coreConfigured;
_backendInfo = msg.backendInfo;
+ _authenticatorInfo = msg.authenticatorInfo;
Client::setCoreFeatures(static_cast<Quassel::Features>(msg.coreFeatures));
Client::setCoreFeatures(static_cast<Quassel::Features>(msg.coreFeatures));
@@
-321,7
+322,7
@@
void ClientAuthHandler::onConnectionReady()
if (!_coreConfigured) {
// start wizard
if (!_coreConfigured) {
// start wizard
- emit startCoreSetup(_backendInfo);
+ emit startCoreSetup(_backendInfo
, _authenticatorInfo
);
}
else // TODO: check if we need LoginEnabled
login();
}
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";
}
default:
qWarning() << "Certificate digest version" << QString(knownDigestVersion) << "is not supported";
}
-
+
if (knownDigest != calculatedDigest) {
bool accepted = false;
bool permanently = false;
if (knownDigest != calculatedDigest) {
bool accepted = false;
bool permanently = false;