/***************************************************************************
- * 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 *
#include "monoapplication.h"
#include "coreapplication.h"
#include "client.h"
-#include "clientsyncer.h"
#include "core.h"
#include "qtui.h"
_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();
}
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 &)));
}