summaryrefslogtreecommitdiffstats
path: root/konqueror/iconview/konq_iconview.cc
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-11-15 23:55:01 +0900
committerMichele Calgaro <[email protected]>2014-11-15 23:55:01 +0900
commit8a6ce15a94e441d514ed4076ea787c0b33b37194 (patch)
treea132de80669ec6214146a3b6e24c879b2eee3eb6 /konqueror/iconview/konq_iconview.cc
parent0a2adc65fa82ffdf5cfa3f7e669614b5474da42b (diff)
parentf07158cd9dcb61b32e7dba5674e8ed0f7c8c6fe2 (diff)
downloadtdebase-8a6ce15a94e441d514ed4076ea787c0b33b37194.tar.gz
tdebase-8a6ce15a94e441d514ed4076ea787c0b33b37194.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'konqueror/iconview/konq_iconview.cc')
-rw-r--r--konqueror/iconview/konq_iconview.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 0e754b848..3b6432d1e 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -1108,8 +1108,6 @@ void KonqKfmIconView::showDirectoryOverlay(KFileIVI* item)
void KonqKfmIconView::showFreeSpaceOverlay(KFileIVI* item)
{
- KFileItem* fileItem = item->item();
-
m_paOutstandingFreeSpaceOverlays.append(item);
if (m_paOutstandingFreeSpaceOverlays.count() == 1)
{
@@ -1296,6 +1294,10 @@ void KonqKfmIconView::determineIcon( KFileIVI * item )
(void) item->item()->determineMimeType();
+ if (item->item()->isMimeTypeKnown()) {
+ item->mimeTypeAndIconDetermined();
+ }
+
item->setIcon( iconSize(), item->state(), true, true );
item->setMouseOverAnimation( item->item()->iconName() );
}