mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Revert "Ignore baloo urls created from new KIO model"
This reverts commit 9d3a019445
.
Causes breakage in Dolphin in master. The proper fix is in D9333.
CCBUG: 389147
This commit is contained in:
parent
2e942237c9
commit
d55b0875ff
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue