X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=fb38348ecdcf82612e62e2b0bcaa136ae8071ee7;hp=9d1b1babee3bd1ab3f1578cbbc6632388021e205;hb=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hpb=419782afd8deeccb1fcd456fcdda2691aa11e406 diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index 9d1b1bab..fb38348e 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2012 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -28,6 +28,7 @@ #include "client.h" #include "cliparser.h" +#include "mainwin.h" #include "qtui.h" #include "qtuisettings.h" @@ -56,6 +57,9 @@ QtUiApplication::QtUiApplication(int &argc, char **argv) #endif /* HAVE_KDE */ +#if defined(HAVE_KDE) || defined(Q_OS_MAC) + disableCrashhandler(); +#endif /* HAVE_KDE || Q_OS_MAC */ setRunMode(Quassel::ClientOnly); qInstallMsgHandler(Client::logMessage); @@ -124,6 +128,10 @@ QtUiApplication::~QtUiApplication() { Client::destroy(); } +void QtUiApplication::quit() { + QtUi::mainWindow()->quit(); +} + void QtUiApplication::commitData(QSessionManager &manager) { Q_UNUSED(manager) _aboutToQuit = true; @@ -131,7 +139,7 @@ void QtUiApplication::commitData(QSessionManager &manager) { void QtUiApplication::saveState(QSessionManager & manager) { //qDebug() << QString("saving session state to id %1").arg(manager.sessionId()); - AccountId activeCore = Client::currentCoreAccount(); // FIXME store this! + // AccountId activeCore = Client::currentCoreAccount().accountId(); // FIXME store this! SessionSettings s(manager.sessionId()); s.setSessionAge(0); QtUi::mainWindow()->saveStateToSettings(s);