X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=5ed2611d7f9e5a5fe77312d2ad87b4700ea06efd;hp=5b9bf5a93a12a87766d88c50f648b0d55360e0b6;hb=15d94f850d7e82b9f9f65ec162d9db13f750d23f;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 5b9bf5a9..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"
 
@@ -30,19 +29,22 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv)
     _internalInitDone(false)
 {
   _internal = new CoreApplicationInternal(); // needed for parser options
-  setRunMode(Monolithic);
+#if defined(HAVE_KDE) || defined(Q_OS_MAC)
+  disableCrashhandler();
+#endif /* HAVE_KDE || Q_OS_MAC */
+  setRunMode(Quassel::Monolithic);
 }
 
 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();
 }
 
@@ -52,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 &)));
 }