Include current nick for highlight checking if "All nicks" is chosen

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

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 97688f2..e63c4d2 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-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,17 +26,24 @@
 #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);
+  setRunMode(Quassel::Monolithic);
 }
 
 bool MonolithicApplication::init() {
-  if(Quassel::init()) {
-    return QtUiApplication::init();
+  if(!Quassel::init()) // parse args
+    return false;
+
+  if(isOptionSet("port")) {
+    _internal->init();
+    _internalInitDone = true;
   }
-  return false;
+
+  connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
+  return QtUiApplication::init();
 }
 
 MonolithicApplication::~MonolithicApplication() {
@@ -45,11 +52,15 @@ MonolithicApplication::~MonolithicApplication() {
   delete _internal;
 }
 
-bool MonolithicApplication::startInternalCore() {
-  return _internal->init();
+void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
+  connect(syncer, SIGNAL(startInternalCore(ClientSyncer *)), this, SLOT(startInternalCore(ClientSyncer *)));
 }
 
-void MonolithicApplication::connectClientSyncer(ClientSyncer *syncer) {
+void MonolithicApplication::startInternalCore(ClientSyncer *syncer) {
+  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 &)));