X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=a46f0999a01d9175d7626f15305cb7937117ac43;hb=130fde74cee428ec2e3285db89c4348c3091b2aa;hp=50221a2ad4ca836e0b8183cab7ec1d0c528d4768;hpb=4831a16871344dc46a8ae9da4e9fd3125f87b785;p=quassel.git

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 50221a2a..a46f0999 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -31,27 +31,27 @@
 #include "cliparser.h"
 
 #if defined BUILD_CORE
-#include <QCoreApplication>
 #include <QDir>
 #include "core.h"
 #include "message.h"
 
 #elif defined BUILD_QTUI
-#include <QApplication>
 #include "client.h"
+#include "qtuiapplication.h"
 #include "qtui.h"
 
 #elif defined BUILD_MONO
-#include <QApplication>
 #include "client.h"
 #include "core.h"
 #include "coresession.h"
+#include "qtuiapplication.h"
 #include "qtui.h"
 
 #else
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
+
 #include <signal.h>
 
 //! Signal handler for graceful shutdown.
@@ -68,6 +68,7 @@ int main(int argc, char **argv) {
   Global::registerMetaTypes();
   Global::setupVersion();
 
+/*
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
@@ -78,6 +79,19 @@ int main(int argc, char **argv) {
   Global::runMode = Global::Monolithic;
   QApplication app(argc, argv);
 #endif
+*/
+#if defined BUILD_CORE
+  Global::runMode = Global::CoreOnly;
+  QCoreApplication app(argc, argv);
+#elif defined BUILD_QTUI
+  Global::runMode = Global::ClientOnly;
+  QtUiApplication app(argc, argv);
+#else
+  Global::runMode = Global::Monolithic;
+  QtUiApplication app(argc, argv);
+#endif
+
+
 
   Global::parser = CliParser(QCoreApplication::arguments());
 
@@ -140,6 +154,7 @@ int main(int argc, char **argv) {
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel Project");
 
+  
 #ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
@@ -147,6 +162,7 @@ int main(int argc, char **argv) {
   //Settings::init();
 
 #ifndef BUILD_CORE
+  // session resume
   QtUi *gui = new QtUi();
   Client::init(gui);
   // init gui only after the event loop has started
@@ -160,6 +176,10 @@ int main(int argc, char **argv) {
   }
 #endif
 
+#ifndef BUILD_CORE 
+  app.resumeSessionIfPossible();
+#endif
+  
   int exitCode = app.exec();
 
 #ifndef BUILD_QTUI