X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=5ed2611d7f9e5a5fe77312d2ad87b4700ea06efd;hp=60df4c5b94c3a367dd8a4808acee58f8f799b716;hb=8e9f08aa0f4e663473b634511b1bcc40145e9ba9;hpb=1d9dfeff6b2531ff99e0d12669b3a1dae393e768 diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp index 60df4c5b..5ed2611d 100644 --- a/src/qtui/monoapplication.cpp +++ b/src/qtui/monoapplication.cpp @@ -39,9 +39,10 @@ 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(); } return QtUiApplication::init(); @@ -59,6 +60,7 @@ void MonolithicApplication::startInternalCore() { _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 &))); }