Make SignalProxy detach QObjects automatically upon their destruction.

[quassel.git] / src / common / main.cpp

diff --git a/src/common/main.cpp b/src/common/main.cpp
index c47d8b7..18503f2 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -19,22 +19,23 @@
  ***************************************************************************/
 
 #include "settings.h"
+#include <QString>
 
 #if defined BUILD_CORE
 #include <QCoreApplication>
+#include <QDir>
 #include "core.h"
+#include "message.h"
 
 #elif defined BUILD_QTGUI
 #include <QApplication>
 #include "client.h"
-#include "clientproxy.h"
 #include "qtgui.h"
 #include "style.h"
 
 #elif defined BUILD_MONO
 #include <QApplication>
 #include "client.h"
-#include "clientproxy.h"
 #include "core.h"
 #include "coresession.h"
 #include "qtgui.h"
@@ -44,7 +45,26 @@
 #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);
@@ -96,16 +116,21 @@ void Client::disconnectFromLocalCore() {}
 #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