properly handling disconnects - this might even fix an antique bug with duplicate...

[quassel.git] / src / qtui / monoapplication.cpp

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index aebe619..b628079 100644 (file)
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -21,24 +21,39 @@
 #include "monoapplication.h"
 #include "coreapplication.h"
 #include "client.h"
+#include "clientsyncer.h"
+#include "core.h"
 #include "qtui.h"
 
-MonolithicApplication::MonolithicApplication(int &argc, char **argv) : QtUiApplication(argc, argv) {
+MonolithicApplication::MonolithicApplication(int &argc, char **argv)
+  : QtUiApplication(argc, argv),
+    _internalInitDone(false)
+{
+  _internal = new CoreApplicationInternal(); // needed for parser options
   setRunMode(Monolithic);
-  _internal = new CoreApplicationInternal();
-
 }
 
 bool MonolithicApplication::init() {
-  if(Quassel::init() && _internal->init()) {
-    return QtUiApplication::init();
-  }
-  return false;
+  connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
+  return QtUiApplication::init();
 }
 
 MonolithicApplication::~MonolithicApplication() {
   // Client needs to be destroyed first
   Client::destroy();
-
   delete _internal;
 }
+
+void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
+  connect(syncer, SIGNAL(startInternalCore()), this, SLOT(startInternalCore()));
+}
+
+void MonolithicApplication::startInternalCore() {
+  if(!_internalInitDone) {
+    _internal->init();
+  }
+  Core *core = Core::instance();
+  ClientSyncer *syncer = static_cast<ClientSyncer *>(sender());
+  connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
+  connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &)));
+}