X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fqtuiapplication.cpp;h=9d1b1babee3bd1ab3f1578cbbc6632388021e205;hp=de9844f291e5b3006b839e31bcad03a77bb92980;hb=e049ffc61b5e260a49d73102a74c3821af827e77;hpb=5080325e7f8c5cf95bbcddf0e2e0cfd2233a5795 diff --git a/src/qtui/qtuiapplication.cpp b/src/qtui/qtuiapplication.cpp index de9844f2..9d1b1bab 100644 --- a/src/qtui/qtuiapplication.cpp +++ b/src/qtui/qtuiapplication.cpp @@ -30,7 +30,6 @@ #include "cliparser.h" #include "qtui.h" #include "qtuisettings.h" -#include "sessionsettings.h" QtUiApplication::QtUiApplication(int &argc, char **argv) #ifdef HAVE_KDE @@ -132,11 +131,10 @@ 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(); + AccountId activeCore = Client::currentCoreAccount(); // FIXME store this! SessionSettings s(manager.sessionId()); s.setSessionAge(0); - emit saveStateToSession(manager.sessionId()); - emit saveStateToSessionSettings(s); + QtUi::mainWindow()->saveStateToSettings(s); } void QtUiApplication::resumeSessionIfPossible() { @@ -146,8 +144,7 @@ void QtUiApplication::resumeSessionIfPossible() { SessionSettings s(sessionId()); s.sessionAging(); s.setSessionAge(0); - emit resumeFromSession(sessionId()); - emit resumeFromSessionSettings(s); + QtUi::mainWindow()->restoreStateFromSettings(s); s.cleanup(); } else { SessionSettings s(QString("1"));