kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Ignore baloo urls created from new KIO model"

Browse source 
This reverts commit 9d3a019445.

Causes breakage in Dolphin in master. The proper fix is in D9333.

CCBUG: 389147
This commit is contained in:
Luca Beltrame 2018-01-19 13:27:52 +01:00
parent 2e942237c9
commit d55b0875ff
1 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/panels/places/placesitemmodel.cpp
View file

@ -56,17 +56,6 @@ namespace {
// Hence a prefix to the application-name of the stored bookmarks is
// added, which is only read by PlacesItemModel.
const char AppNamePrefix[] = "-places-panel";
static QList<QUrl> balooURLs = {
QUrl(QStringLiteral("timeline:/today")),
QUrl(QStringLiteral("timeline:/yesterday")),
QUrl(QStringLiteral("timeline:/thismonth")),
QUrl(QStringLiteral("timeline:/lastmonth")),
QUrl(QStringLiteral("search:/documents")),
QUrl(QStringLiteral("search:/images")),
QUrl(QStringLiteral("search:/audio")),
QUrl(QStringLiteral("search:/videos"))
};
}
PlacesItemModel::PlacesItemModel(QObject* parent) :
@ -642,11 +631,6 @@ bool PlacesItemModel::acceptBookmark(const KBookmark& bookmark) const
const QUrl url = bookmark.url();
const QString appName = bookmark.metaDataItem(QStringLiteral("OnlyInApp"));
if (balooURLs.contains(url) && appName.isEmpty()) {
// Does not accept baloo URLS with empty appName, this came from new KIO model and will cause duplications
qCWarning(DolphinDebug) << "Ignore KIO url:" << url;
return false;
}
const bool allowedHere = (appName.isEmpty()
|| appName == KAboutData::applicationData().componentName()
|| appName == KAboutData::applicationData().componentName() + AppNamePrefix);