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

Update ignored schemes for saving history and icons

Browse Source
This commit is contained in:
David Rosca 2016-12-31 14:53:06 +01:00
parent 271d5f6555
commit 9b3fc5f404
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/history/history.cpp
View File

@ -68,11 +68,15 @@ void History::addHistoryEntry(const QUrl &url, QString title)
if (!m_isSaving) { if (!m_isSaving) {
return; return;
} }
if (url.isEmpty() ||
url.scheme() == QLatin1String("qupzilla") || const QStringList ignoredSchemes = {
url.scheme() == QLatin1String("about") || QStringLiteral("qupzilla"),
url.scheme() == QLatin1String("data") QStringLiteral("view-source"),
) { QStringLiteral("data"),
QStringLiteral("about")
};
if (url.isEmpty() || ignoredSchemes.contains(url.scheme())) {
return; return;
} }

2
src/lib/navigation/locationbar.cpp
View File

@ -235,7 +235,7 @@ QString LocationBar::convertUrlToText(const QUrl &url)
QString stringUrl = QzTools::urlEncodeQueryString(url); QString stringUrl = QzTools::urlEncodeQueryString(url);
if (stringUrl == QL1S("qupzilla:speeddial") || stringUrl.startsWith(QL1S("qupzilla:adblock")) || stringUrl == QL1S("about:blank")) { if (stringUrl == QL1S("qupzilla:speeddial") || stringUrl == QL1S("about:blank")) {
stringUrl.clear(); stringUrl.clear();
} }

10
src/lib/tools/iconprovider.cpp
View File

@ -58,13 +58,13 @@ void IconProvider::saveIcon(WebView* view)
QStringLiteral("qupzilla"), QStringLiteral("qupzilla"),
QStringLiteral("ftp"), QStringLiteral("ftp"),
QStringLiteral("file"), QStringLiteral("file"),
QStringLiteral("view-source") QStringLiteral("view-source"),
QStringLiteral("data"),
QStringLiteral("about")
}; };
for (const QString &scheme : ignoredSchemes) { if (ignoredSchemes.contains(view->url().scheme())) {
if (view->url().scheme() == scheme) { return;
return;
}
} }
BufferedIcon item; BufferedIcon item;