X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=8320dc08b216f95ee58ea2f96a9a283a7e4f86bb;hp=7a274320a2636420063855ed63392893b342453f;hb=e5f3a784b8c6e6b4fe9b299c3a3553f31fba5601;hpb=f12ff6555fc60d165d5057902a91cdff355816b9 diff --git a/src/core/core.cpp b/src/core/core.cpp index 7a274320..8320dc08 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -414,9 +414,7 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { QVariantMap reply; // Just version information -- check it! - uint ver = 0; - if(!msg.contains("ProtocolVersion") && msg["ClientBuild"].toUInt() >= 732) ver = 1; // FIXME legacy - if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt(); + uint ver = msg["ProtocolVersion"].toUInt(); if(ver < Quassel::buildInfo().coreNeedsProtocol) { reply["MsgType"] = "ClientInitReject"; reply["Error"] = tr("Your Quassel Client is too old!
" @@ -429,7 +427,6 @@ void Core::processClientMessage(QTcpSocket *socket, const QVariantMap &msg) { reply["CoreVersion"] = Quassel::buildInfo().fancyVersionString; reply["CoreDate"] = Quassel::buildInfo().buildDate; - reply["CoreBuild"] = 860; // FIXME legacy reply["ProtocolVersion"] = Quassel::buildInfo().protocolVersion; // TODO: Make the core info configurable int uptime = startTime().secsTo(QDateTime::currentDateTime().toUTC());