This should fix a bug resulting in a crash, when a IrcUser object was not destroyed...

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

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 51de3c4..f562dd4 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -18,67 +18,84 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#include <iostream>
-
 #include "global.h"
 #include "settings.h"
-#include "quasselui.h"
+#include <QString>
+#include <QTranslator>
 
 #if defined BUILD_CORE
 #include <QCoreApplication>
+#include <QDir>
 #include "core.h"
+#include "message.h"
 
-#elif defined BUILD_QTGUI
+#elif defined BUILD_QTUI
 #include <QApplication>
-#include "style.h"
 #include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
+#include "qtui.h"
 
 #elif defined BUILD_MONO
 #include <QApplication>
-#include "core.h"
-#include "coreproxy.h"
-#include "style.h"
 #include "client.h"
-#include "clientproxy.h"
-#include "mainwin.h"
+#include "core.h"
+#include "coresession.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.
+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<BufferInfo>("BufferInfo");
+  qRegisterMetaTypeStreamOperators<QVariant>("QVariant");
+  qRegisterMetaTypeStreamOperators<Message>("Message");
+  qRegisterMetaTypeStreamOperators<BufferInfo>("BufferInfo");
+
 #if defined BUILD_CORE
   Global::runMode = Global::CoreOnly;
   QCoreApplication app(argc, argv);
-#elif defined BUILD_QTGUI
+#elif defined BUILD_QTUI
   Global::runMode = Global::ClientOnly;
   QApplication app(argc, argv);
 #else
   Global::runMode = Global::Monolithic;
   QApplication app(argc, argv);
 #endif
-  //AbstractUi *foo = new AbstractUi();
-  //foo->init();
+
+  //Just for testing
+  //QTranslator translator;
+  //translator.load(":i18n/quassel_de");
+  //app.installTranslator(&translator);
+
+            
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("Quassel IRC Development Team");
 
-  Global::quasselDir = QDir::homePath() + "/.quassel";
-#ifndef BUILD_QTGUI
+#ifndef BUILD_QTUI
   Core::instance();  // create and init the core
 #endif
 
-  Settings::init();
+  //Settings::init();
 
 #ifndef BUILD_CORE
-  Style::init();
-  QtGui *gui = new QtGui();
+  QtUi *gui = new QtUi();
   Client::init(gui);
   gui->init();
-//#else
-//  Core::instance(); // create and init the core object
 #endif
 
   int exitCode = app.exec();
@@ -90,30 +107,9 @@ int main(int argc, char **argv) {
   delete gui;
   Client::destroy();
 #endif
-#ifndef BUILD_QTGUI
+#ifndef BUILD_QTUI
   Core::destroy();
 #endif
 
   return exitCode;
 }
-
-#ifdef BUILD_QTGUI
-QVariant Client::connectToLocalCore(QString, QString) { return QVariant(); }
-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;
-}
-
-void Client::disconnectFromLocalCore() {
-  disconnect(Core::localSession(), 0, ClientProxy::instance(), 0);
-  disconnect(ClientProxy::instance(), 0, Core::localSession(), 0);
-  Core::disconnectLocalClient();
-}
-
-#endif