Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

Remove leftover references to no longer used pinnedtabs.dat file

Browse Source
This commit is contained in:
David Rosca 2017-12-30 15:47:17 +01:00
parent 397e2f714e
commit 5ecf3d8b98
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/app/mainapplication.cpp
View File

@ -323,9 +323,6 @@ MainApplication::MainApplication(int &argc, char** argv)
m_restoreManager = new RestoreManager(sessionManager()->lastActiveSessionPath()); m_restoreManager = new RestoreManager(sessionManager()->lastActiveSessionPath());
if (!m_restoreManager->isValid()) { if (!m_restoreManager->isValid()) {
destroyRestoreManager(); destroyRestoreManager();
} else {
// Pinned tabs are saved into session.dat, so remove the old saved pinned tabs
QFile::remove(DataPaths::currentProfilePath() + QL1S("/pinnedtabs.dat"));
} }
} }
} }
@ -429,7 +426,6 @@ void MainApplication::openSession(BrowserWindow* window, RestoreData &restoreDat
// //
// Don't restore tabs in current window as user already opened // Don't restore tabs in current window as user already opened
// some new tabs. // some new tabs.
// Instead create new one and restore pinned tabs there
BrowserWindow* newWin = createWindow(Qz::BW_OtherRestoredWindow); BrowserWindow* newWin = createWindow(Qz::BW_OtherRestoredWindow);
newWin->restoreWindowState(restoreData.at(0)); newWin->restoreWindowState(restoreData.at(0));
restoreData.remove(0); restoreData.remove(0);

1
src/lib/network/schemehandlers/falkonschemehandler.cpp
View File

@ -378,7 +378,6 @@ QString FalkonSchemeReply::configPage()
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Profile"), DataPaths::currentProfilePath()) + QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Profile"), DataPaths::currentProfilePath()) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Settings"), DataPaths::currentProfilePath() + "/settings.ini") + QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Settings"), DataPaths::currentProfilePath() + "/settings.ini") +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Saved session"), SessionManager::defaultSessionPath()) + QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Saved session"), SessionManager::defaultSessionPath()) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Pinned tabs"), DataPaths::currentProfilePath() + "/pinnedtabs.dat") +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Data"), DataPaths::path(DataPaths::AppData)) + QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Data"), DataPaths::path(DataPaths::AppData)) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Themes"), DataPaths::path(DataPaths::Themes)) + QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Themes"), DataPaths::path(DataPaths::Themes)) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Translations"), DataPaths::path(DataPaths::Translations))); QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Translations"), DataPaths::path(DataPaths::Translations)));