X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclientsyncer.cpp;h=601bff0368eb534f5ec1f03c2f33bc017b11d637;hb=57c70d731905d863116709c8524104b762f4e756;hp=b8cf4b29c148f45f148d459046beffef374e4ab2;hpb=ee6e4f90ce63d7eb3a54937cffb33510398d2349;p=quassel.git

diff --git a/src/client/clientsyncer.cpp b/src/client/clientsyncer.cpp
index b8cf4b29..601bff03 100644
--- a/src/client/clientsyncer.cpp
+++ b/src/client/clientsyncer.cpp
@@ -59,6 +59,10 @@ void ClientSyncer::coreHasData() {
       emit connectionError(msg["Error"].toString());
       disconnectFromCore();
       return;
+    } else if(msg["MsgType"] == "CoreSetupAck") {
+      emit coreSetupSuccess();
+    } else if(msg["MsgType"] == "CoreSetupReject") {
+      emit coreSetupFailed(msg["Error"].toString());
     } else if(msg["MsgType"] == "ClientLoginReject") {
       emit loginFailed(msg["Error"].toString());
     } else if(msg["MsgType"] == "ClientLoginAck") {
@@ -168,16 +172,26 @@ 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...
   if(msg["CoreBuild"].toUInt() < Global::coreBuildNeeded) {
     emit connectionError(tr("<b>The Quassel Core you are trying to connect to is too old!</b><br>"
-        "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::quasselBuild));
+        "Need at least a Core Version %1 (Build >= %2) to connect.").arg(Global::quasselVersion).arg(Global::coreBuildNeeded));
     disconnectFromCore();
     return;
   }
   emit connectionMsg(msg["CoreInfo"].toString());
-  if(msg["LoginEnabled"].toBool()) {
+  if(!msg["Configured"].toBool()) {
+    // start wizard
+    emit startCoreSetup(msg["StorageBackends"].toList());
+  } else if(msg["LoginEnabled"].toBool()) {
     emit startLogin();
   }
 }
 
+void ClientSyncer::doCoreSetup(const QVariant &setupData) {
+  QVariantMap setup;
+  setup["MsgType"] = "CoreSetupData";
+  setup["SetupData"] = setupData;
+  SignalProxy::writeDataToDevice(socket, setup);
+}
+
 void ClientSyncer::loginToCore(const QString &user, const QString &passwd) {
   emit connectionMsg(tr("Logging in..."));
   QVariantMap clientLogin;