X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=5ed2611d7f9e5a5fe77312d2ad87b4700ea06efd;hp=aebe619aa1e0163759372859a4651236a0184760;hb=3013f4e095802e906c85878436da9e2ee3f9028c;hpb=5c6804f291a63f978e328aeddcc8448e3443b45e

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index aebe619a..5ed2611d 100644
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,24 +21,46 @@
 #include "monoapplication.h"
 #include "coreapplication.h"
 #include "client.h"
+#include "core.h"
 #include "qtui.h"
 
-MonolithicApplication::MonolithicApplication(int &argc, char **argv) : QtUiApplication(argc, argv) {
-  setRunMode(Monolithic);
-  _internal = new CoreApplicationInternal();
-
+MonolithicApplication::MonolithicApplication(int &argc, char **argv)
+  : QtUiApplication(argc, argv),
+    _internalInitDone(false)
+{
+  _internal = new CoreApplicationInternal(); // needed for parser options
+#if defined(HAVE_KDE) || defined(Q_OS_MAC)
+  disableCrashhandler();
+#endif /* HAVE_KDE || Q_OS_MAC */
+  setRunMode(Quassel::Monolithic);
 }
 
 bool MonolithicApplication::init() {
-  if(Quassel::init() && _internal->init()) {
-    return QtUiApplication::init();
+  if(!Quassel::init()) // parse args
+    return false;
+
+  connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+
+  if(isOptionSet("port")) {
+    startInternalCore();
   }
-  return false;
+
+  return QtUiApplication::init();
 }
 
 MonolithicApplication::~MonolithicApplication() {
   // Client needs to be destroyed first
   Client::destroy();
-
   delete _internal;
 }
+
+void MonolithicApplication::startInternalCore() {
+  if(!_internalInitDone) {
+    _internal->init();
+    _internalInitDone = true;
+  }
+  Core *core = Core::instance();
+  CoreConnection *connection = Client::coreConnection();
+  connect(connection, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
+  connect(core, SIGNAL(sessionState(const QVariant &)), connection, SLOT(internalSessionStateReceived(const QVariant &)));
+}