Sanitize topic message

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

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 97688f2..69ca448 100644 (file)
--- 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-2013 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,42 +15,61 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "monoapplication.h"
 #include "coreapplication.h"
 #include "client.h"
-#include "clientsyncer.h"
 #include "core.h"
 #include "qtui.h"
 
+class InternalPeer;
+
 MonolithicApplication::MonolithicApplication(int &argc, char **argv)
-  : QtUiApplication(argc, argv)
+    : QtUiApplication(argc, argv),
+    _internalInitDone(false)
 {
-  _internal = new CoreApplicationInternal(); // needed for parser options
-  setRunMode(Monolithic);
+    _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()) {
+
+bool MonolithicApplication::init()
+{
+    if (!Quassel::init()) // parse args
+        return false;
+
+    connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+
+    // FIXME what's this for?
+    if (isOptionSet("port")) {
+        startInternalCore();
+    }
+
     return QtUiApplication::init();
-  }
-  return false;
 }
 
-MonolithicApplication::~MonolithicApplication() {
-  // Client needs to be destroyed first
-  Client::destroy();
-  delete _internal;
-}
 
-bool MonolithicApplication::startInternalCore() {
-  return _internal->init();
+MonolithicApplication::~MonolithicApplication()
+{
+    // Client needs to be destroyed first
+    Client::destroy();
+    delete _internal;
 }
 
-void MonolithicApplication::connectClientSyncer(ClientSyncer *syncer) {
-  Core *core = Core::instance();
-  connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
-  connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &)));
+
+void MonolithicApplication::startInternalCore()
+{
+    if (!_internalInitDone) {
+        _internal->init();
+        _internalInitDone = true;
+    }
+    Core *core = Core::instance();
+    CoreConnection *connection = Client::coreConnection();
+    connect(connection, SIGNAL(connectToInternalCore(InternalPeer*)), core, SLOT(setupInternalClientSession(InternalPeer*)));
+    connect(core, SIGNAL(sessionState(QVariant)), connection, SLOT(internalSessionStateReceived(QVariant)));
 }