mirror of
https://invent.kde.org/system/dolphin
synced 2024-08-22 09:50:12 +00:00
Merge remote-tracking branch 'origin/KDE/4.13'
This commit is contained in:
commit
f27c124237
|
@ -135,7 +135,7 @@ void PlacesItem::setBookmark(const KBookmark& bookmark)
|
||||||
const QString udi = bookmark.metaDataItem("UDI");
|
const QString udi = bookmark.metaDataItem("UDI");
|
||||||
if (udi.isEmpty()) {
|
if (udi.isEmpty()) {
|
||||||
setIcon(bookmark.icon());
|
setIcon(bookmark.icon());
|
||||||
setText(bookmark.text());
|
setText(i18nc("KFile System Bookmarks", bookmark.text().toUtf8().data()));
|
||||||
setUrl(bookmark.url());
|
setUrl(bookmark.url());
|
||||||
} else {
|
} else {
|
||||||
initializeDevice(udi);
|
initializeDevice(udi);
|
||||||
|
|
|
@ -92,10 +92,7 @@ void FileNameSearchProtocol::searchDirectory(const KUrl& directory)
|
||||||
if (!m_regExp || item.name().contains(*m_regExp)) {
|
if (!m_regExp || item.name().contains(*m_regExp)) {
|
||||||
addItem = true;
|
addItem = true;
|
||||||
} else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
|
} else if (m_checkContent && item.determineMimeType()->is(QLatin1String("text/plain"))) {
|
||||||
qDebug() << "### Checking" << item;
|
|
||||||
addItem = contentContainsPattern(item.url());
|
addItem = contentContainsPattern(item.url());
|
||||||
} else {
|
|
||||||
qDebug() << "### NOT Checking" << item;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (addItem) {
|
if (addItem) {
|
||||||
|
|
Loading…
Reference in a new issue