X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=18503f25ed70e4868571da89881cf7d548c6f733;hp=a35ab4cbf170c2bf4db32c0028120b76dd2aeb99;hb=48151f63e7f953bf07828be39ba314095c472c74;hpb=8836fdc8e4107437e5fff0e10e18d581297d59e4

diff --git a/src/common/main.cpp b/src/common/main.cpp
index a35ab4cb..18503f25 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -18,37 +18,53 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <iostream>
-
-#include "global.h"
 #include "settings.h"
-#include "quasselui.h"
+#include <QString>
 
 #if defined BUILD_CORE
 #include <QCoreApplication>
+#include <QDir>
 #include "core.h"
+#include "message.h"
 
 #elif defined BUILD_QTGUI
 #include <QApplication>
-#include "style.h"
 #include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
+#include "qtgui.h"
+#include "style.h"
 
 #elif defined BUILD_MONO
 #include <QApplication>
+#include "client.h"
 #include "core.h"
-#include "coreproxy.h"
+#include "coresession.h"
+#include "qtgui.h"
 #include "style.h"
-#include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
 
 #else
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
+#include <signal.h>
+
+//! Signal handler for graceful shutdown.
+void handle_signal(int sig) {
+  qWarning(QString("Caught signal %1 - exiting.").arg(sig).toAscii());
+  QCoreApplication::quit();
+}
+
 int main(int argc, char **argv) {
+  // We catch SIGTERM and SIGINT (caused by Ctrl+C) to graceful shutdown Quassel.
+  signal(SIGTERM, handle_signal);
+  signal(SIGINT, handle_signal);
+
+  qRegisterMetaType<QVariant>("QVariant");
+  qRegisterMetaType<Message>("Message");
+  qRegisterMetaType<BufferId>("BufferId");
+  qRegisterMetaTypeStreamOperators<QVariant>("QVariant");
+  qRegisterMetaTypeStreamOperators<Message>("Message");
+  qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
+
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
@@ -59,8 +75,6 @@ int main(int argc, char **argv) {
   Global::runMode = Global::Monolithic;
   QApplication app(argc, argv);
 #endif
-  //AbstractUi *foo = new AbstractUi();
-  //foo->init();
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel IRC Development Team");
@@ -70,17 +84,13 @@ int main(int argc, char **argv) {
   Core::instance();  // create and init the core
 #endif
 
-  Settings::init();
+  //Settings::init();
 
 #ifndef BUILD_CORE
   Style::init();
-  AbstractUi foo;  // This avoids an annoying linker error (bug?) where AbstractUi's vtable is not found.
-                   // Yes, it's fugly. Yes, I'd like an alternative.
   QtGui *gui = new QtGui();
   Client::init(gui);
   gui->init();
-//#else
-//  Core::instance(); // create and init the core object
 #endif
 
   int exitCode = app.exec();
@@ -102,20 +112,25 @@ int main(int argc, char **argv) {
 #ifdef BUILD_QTGUI
 QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); }
 void Client::disconnectFromLocalCore() {}
-#elif defined BUILD_MONO
 
+#elif defined BUILD_MONO
 QVariant Client::connectToLocalCore(QString user, QString passwd) {
   // TODO catch exceptions
+  /*
   QVariant reply = Core::connectLocalClient(user, passwd);
   QObject::connect(Core::localSession(), SIGNAL(proxySignal(CoreSignal, QVariant, QVariant, QVariant)), ClientProxy::instance(), SLOT(recv(CoreSignal, QVariant, QVariant, QVariant)));
   QObject::connect(ClientProxy::instance(), SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), Core::localSession(), SLOT(processSignal(ClientSignal, QVariant, QVariant, QVariant)));
   return reply;
+  */
+  return QVariant();
 }
 
 void Client::disconnectFromLocalCore() {
+  /*
   disconnect(Core::localSession(), 0, ClientProxy::instance(), 0);
   disconnect(ClientProxy::instance(), 0, Core::localSession(), 0);
   Core::disconnectLocalClient();
+  */
 }
 
 #endif