X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=5ed2611d7f9e5a5fe77312d2ad87b4700ea06efd;hp=216601aab2ba5655d639ad94c11517bd55efc46e;hb=6353231ed1d32a5be3580ba60a06d9cf588ad877;hpb=906391224228274450914361efd104630827e580

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 216601aa..5ed2611d 100644
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -21,7 +21,6 @@
 #include "monoapplication.h"
 #include "coreapplication.h"
 #include "client.h"
-#include "clientsyncer.h"
 #include "core.h"
 #include "qtui.h"
 
@@ -40,12 +39,12 @@ bool MonolithicApplication::init() {
   if(!Quassel::init()) // parse args
     return false;
 
+  connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+
   if(isOptionSet("port")) {
-    _internal->init();
-    _internalInitDone = true;
+    startInternalCore();
   }
 
-  connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
   return QtUiApplication::init();
 }
 
@@ -55,16 +54,13 @@ MonolithicApplication::~MonolithicApplication() {
   delete _internal;
 }
 
-void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
-  connect(syncer, SIGNAL(startInternalCore(ClientSyncer *)), this, SLOT(startInternalCore(ClientSyncer *)));
-}
-
-void MonolithicApplication::startInternalCore(ClientSyncer *syncer) {
+void MonolithicApplication::startInternalCore() {
   if(!_internalInitDone) {
     _internal->init();
     _internalInitDone = true;
   }
   Core *core = Core::instance();
-  connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
-  connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &)));
+  CoreConnection *connection = Client::coreConnection();
+  connect(connection, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
+  connect(core, SIGNAL(sessionState(const QVariant &)), connection, SLOT(internalSessionStateReceived(const QVariant &)));
 }