From d55b0875ffac78ba99ca63f774be17273d396137 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Fri, 19 Jan 2018 13:27:52 +0100 Subject: [PATCH] Revert "Ignore baloo urls created from new KIO model" This reverts commit 9d3a019445d7a7fdf3177bca9eeef4c44599e706. Causes breakage in Dolphin in master. The proper fix is in D9333. CCBUG: 389147 --- src/panels/places/placesitemmodel.cpp | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index ad01ea87e7..62d1e5d78f 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -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 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);