kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.13'

Browse source
This commit is contained in:
Frank Reininghaus 2014-05-21 22:44:48 +02:00
commit 86c39b4487
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dolphin/src/panels/places/placesitem.cpp
View file

@ -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);

3
dolphin/src/search/filenamesearchprotocol.cpp
View file

@ -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) {