X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=2b532705e439ca5a2f1f46e7045fdfd44e6e1e0d;hp=234a3c9f942cc4ddfa54e0d5f88b1055802d7f2a;hb=e5f3a784b8c6e6b4fe9b299c3a3553f31fba5601;hpb=f12ff6555fc60d165d5057902a91cdff355816b9

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index 234a3c9f..2b532705 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -157,7 +157,6 @@ void ClientSyncer::coreSocketConnected() {
   QVariantMap clientInit;
   clientInit["MsgType"] = "ClientInit";
   clientInit["ClientVersion"] = Quassel::buildInfo().fancyVersionString;
-  clientInit["ClientBuild"] = 860; // FIXME legacy!
   clientInit["ClientDate"] = Quassel::buildInfo().buildDate;
   clientInit["ProtocolVersion"] = Quassel::buildInfo().protocolVersion;
   clientInit["UseSsl"] = coreConnectionInfo["useSsl"];
@@ -184,9 +183,7 @@ void ClientSyncer::coreSocketDisconnected() {
 
 void ClientSyncer::clientInitAck(const QVariantMap &msg) {
   // Core has accepted our version info and sent its own. Let's see if we accept it as well...
-  uint ver = 0;
-  if(!msg.contains("ProtocolVersion") && msg["CoreBuild"].toUInt() >= 732) ver = 1; // legacy!
-  if(msg.contains("ProtocolVersion")) ver = msg["ProtocolVersion"].toUInt();
+  uint ver = msg["ProtocolVersion"].toUInt();
   if(ver < Quassel::buildInfo().clientNeedsProtocol) {
     emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
         "Need at least core/client protocol v%1 to connect.").arg(Quassel::buildInfo().clientNeedsProtocol));