#include "quassel.h"
#include "signalproxy.h"
+//#ifdef BUILD_MONO
+#include "core.h"
+//#endif
+
ClientSyncer::ClientSyncer(QObject *parent)
: QObject(parent)
{
blockSize = 0;
connect(Client::signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
+
+ //#ifdef BUILD_MONO
+ connect(this, SIGNAL(connectToInternalCore(SignalProxy *)), Core::instance(), SLOT(setupInternalClientSession(SignalProxy *)));
+ connect(Core::instance(), SIGNAL(sessionState(const QVariant &)), this, SLOT(internalSessionStateReceived(const QVariant &)));
+ //#endif
}
ClientSyncer::~ClientSyncer() {
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"];
SignalProxy::writeDataToDevice(socket, clientInit);
}
+void ClientSyncer::useInternalCore() {
+ emit connectToInternalCore(Client::instance()->signalProxy());
+}
+
void ClientSyncer::coreSocketDisconnected() {
emit socketDisconnected();
Client::instance()->disconnectFromCore();
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));
SignalProxy::writeDataToDevice(socket, clientLogin);
}
+void ClientSyncer::internalSessionStateReceived(const QVariant &packedState) {
+ QVariantMap state = packedState.toMap();
+ emit sessionProgress(1, 1);
+ // Client::instance()->setConnectedToCore(socket, AccountId());
+ syncToCore(state);
+}
+
void ClientSyncer::sessionStateReceived(const QVariantMap &state) {
emit sessionProgress(1, 1);
disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(sessionProgress(quint32, quint32)));