diff options
| -rw-r--r-- | src/sessionmanager.cpp | 14 | ||||
| -rw-r--r-- | src/sessionmanager.h | 4 | ||||
| -rw-r--r-- | src/tabwindow/tabwidget.cpp | 4 |
3 files changed, 2 insertions, 20 deletions
diff --git a/src/sessionmanager.cpp b/src/sessionmanager.cpp index 537d4453..8c781720 100644 --- a/src/sessionmanager.cpp +++ b/src/sessionmanager.cpp @@ -32,7 +32,6 @@ // Local Includes #include "application.h" -#include "autosaver.h" #include "tabhistory.h" #include "rekonqwindow.h" @@ -158,26 +157,13 @@ SessionManager::SessionManager(QObject *parent) : QObject(parent) , m_safe(true) , m_isSessionEnabled(false) - , m_saveTimer(new AutoSaver(this)) { - // AutoSaver. Save your hd from frying... - connect(m_saveTimer, SIGNAL(saveNeeded()), this, SLOT(save())); - m_sessionFilePath = KStandardDirs::locateLocal("appdata" , "session"); } void SessionManager::saveSession() { - if (!m_isSessionEnabled) - return; - - m_saveTimer->changeOccurred(); -} - - -void SessionManager::save() -{ if (!m_isSessionEnabled || !m_safe) return; diff --git a/src/sessionmanager.h b/src/sessionmanager.h index 1cd2ba71..6d6bef26 100644 --- a/src/sessionmanager.h +++ b/src/sessionmanager.h @@ -39,7 +39,6 @@ #include <QWeakPointer> // Forward Declarations -class AutoSaver; class TabHistory; class RekonqWindow; @@ -86,8 +85,6 @@ public Q_SLOTS: void saveSession(); private Q_SLOTS: - void save(); - // This method restores session // after a crash void restoreCrashedSession(); @@ -97,7 +94,6 @@ private: bool m_safe; bool m_isSessionEnabled; - AutoSaver *m_saveTimer; static QWeakPointer<SessionManager> s_sessionManager; }; diff --git a/src/tabwindow/tabwidget.cpp b/src/tabwindow/tabwidget.cpp index d74f0778..a7b4f2be 100644 --- a/src/tabwindow/tabwidget.cpp +++ b/src/tabwindow/tabwidget.cpp @@ -376,12 +376,12 @@ void TabWidget::loadUrl(const KUrl &url, Rekonq::OpenType type, TabHistory *hist break; }; - tab->load(url); - if (history) { history->applyHistory(tab->page()->history()); } + + tab->load(url); } |