X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcore.cpp;h=7b57661859a8da3460eea5fa8b9e92c942eb4832;hp=dc22a97305dfadf448799b8fe9484778f5743114;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=de9a7ec6b70c796182e0a7992aa380a58b954b94

diff --git a/src/core/core.cpp b/src/core/core.cpp
index dc22a973..7b576618 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -25,7 +25,7 @@
 
 Core *Core::instanceptr = 0;
 
-Core * Core::instance() {
+Core *Core::instance() {
   if(instanceptr) return instanceptr;
   instanceptr = new Core();
   instanceptr->init();
@@ -38,7 +38,6 @@ void Core::destroy() {
 }
 
 Core::Core() {
-
 }
 
 void Core::init() {
@@ -112,7 +111,7 @@ void Core::clientHasData() {
     try {
       processClientInit(socket, item);
     } catch(Storage::AuthError) {
-      qWarning() << "Authentification error!";  // FIXME
+      qWarning() << "Authentification error!";  // FIXME: send auth error to client
       socket->close();
       return;
     } catch(Exception e) {
@@ -121,7 +120,7 @@ void Core::clientHasData() {
       return;
     }
   }
-  blockSizes[socket] = bsize = 0;  // FIXME blockSizes aufräum0rn!
+  blockSizes[socket] = bsize = 0;  // FIXME blockSizes aufräum0rn!
 }
 
 // FIXME: no longer called, since connection handling is now in SignalProxy
@@ -156,16 +155,17 @@ void Core::processClientInit(QTcpSocket *socket, const QVariant &v) {
   QVariant reply = initSession(uid);
   disconnect(socket, 0, this, 0);
   sessions[uid]->addClient(socket);
+  qDebug() << "Client initialized successfully.";
   writeDataToDevice(socket, reply);
 }
 
 QVariant Core::initSession(UserId uid) {
   // Find or create session for validated user
   CoreSession *sess;
-  if(sessions.contains(uid)) sess = sessions[uid];
-  else {
+  if(sessions.contains(uid))
+    sess = sessions[uid];
+  else
     sess = createSession(uid);
-  }
   QVariantMap reply;
   reply["SessionState"] = sess->sessionState();
   return reply;