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

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 97688f2a..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,22 +21,31 @@
 #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)
+  : QtUiApplication(argc, 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()) {
-    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() {
@@ -45,12 +54,13 @@ MonolithicApplication::~MonolithicApplication() {
   delete _internal;
 }
 
-bool MonolithicApplication::startInternalCore() {
-  return _internal->init();
-}
-
-void MonolithicApplication::connectClientSyncer(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 &)));
 }