X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=7b05c734ec690bb155a9f4bda40b7d19a61078e7;hp=97688f2a94df54eccbf3e7758b60cdd93955ddc8;hb=299541db5d6586c0b09e036816dfd28477ebc249;hpb=f4ae0007ac4524612ae73a778ca491659cf22393 diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index 97688f2a..7b05c734 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -33,8 +33,9 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv) } bool MonolithicApplication::init() { - if(Quassel::init()) { - return QtUiApplication::init(); + connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *))); + if(QtUiApplication::init()) { + return true; } return false; } @@ -45,12 +46,14 @@ MonolithicApplication::~MonolithicApplication() { delete _internal; } -bool MonolithicApplication::startInternalCore() { - return _internal->init(); +void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) { + connect(syncer, SIGNAL(startInternalCore()), this, SLOT(startInternalCore())); } -void MonolithicApplication::connectClientSyncer(ClientSyncer *syncer) { +void MonolithicApplication::startInternalCore() { + _internal->init(); Core *core = Core::instance(); + ClientSyncer *syncer = static_cast(sender()); connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *))); connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &))); }