ssl: Remove legacy useSsl account setting

[quassel.git] / src / common / protocols / legacy / legacypeer.cpp

diff --git a/src/common/protocols/legacy/legacypeer.cpp b/src/common/protocols/legacy/legacypeer.cpp
index 027c333..0ec819e 100644 (file)
--- a/src/common/protocols/legacy/legacypeer.cpp
+++ b/src/common/protocols/legacy/legacypeer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -49,7 +49,7 @@ void LegacyPeer::setSignalProxy(::SignalProxy* proxy)
         // enable compression now if requested - the initial handshake is uncompressed in the legacy protocol!
         _useCompression = socket()->property("UseCompression").toBool();
         if (_useCompression)
-            qDebug() << "Using compression for peer:" << qPrintable(socket()->peerAddress().toString());
+            qDebug() << "Using compression for peer:" << qPrintable(address());
     }
 }
 
@@ -237,7 +237,7 @@ void LegacyPeer::dispatch(const RegisterClient& msg)
 
     // FIXME only in compat mode
     m["ProtocolVersion"] = protocolVersion;
-    m["UseSsl"] = msg.sslSupported;
+    m["UseSsl"] = true;
 #ifndef QT_NO_COMPRESS
     m["UseCompression"] = true;
 #else
@@ -394,8 +394,8 @@ void LegacyPeer::handlePackedFunc(const QVariant& packedFunc)
             qWarning() << Q_FUNC_INFO << "Received empty RPC call!";
             return;
         }
-        QByteArray slotName = params.takeFirst().toByteArray();
-        handle(Protocol::RpcCall(slotName, params));
+        QByteArray signalName = params.takeFirst().toByteArray();
+        handle(Protocol::RpcCall(signalName, params));
         break;
     }
     case InitRequest: {
@@ -457,7 +457,7 @@ void LegacyPeer::dispatch(const Protocol::SyncMessage& msg)
 
 void LegacyPeer::dispatch(const Protocol::RpcCall& msg)
 {
-    dispatchPackedFunc(QVariantList() << (qint16)RpcCall << msg.slotName << msg.params);
+    dispatchPackedFunc(QVariantList() << (qint16)RpcCall << msg.signalName << msg.params);
 }
 
 void LegacyPeer::dispatch(const Protocol::InitRequest& msg)