From: Sebastian Trueg <sebastian@trueg.de>
Date: Fri, 27 Jun 2008 18:34:52 +0000 (+0000)
Subject: It is hard to understand which is the actual selected item here: m_selection, m_fileI... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/868d2c946a51010a47c14707c2a89756680f29e9?ds=inline

It is hard to understand which is the actual selected item here: m_selection, m_fileItem, or m_shownUrl. Anyway, now the descision for the metadata uses the exact same algo as for the name and preview and it works.

svn path=/trunk/KDE/kdebase/apps/; revision=825279
---

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 4cb4e22c6..2cfe56bf7 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -339,16 +339,11 @@ void InfoSidebarPage::showMetaInfo()
 {
     m_metaTextLabel->clear();
 
+    const KUrl file = (!m_fileItem.isNull() || m_selection.isEmpty()) ? m_shownUrl : m_selection[0].url();
+
     if ((m_selection.size() <= 1) || !m_fileItem.isNull()) {
-        KFileItem fileItem;
-        if (m_fileItem.isNull()) {
-            // no pending request is ongoing
-            const KUrl url = (m_selection.size() == 1) ? m_selection.first().url() : m_shownUrl;
-            fileItem = KFileItem(KFileItem::Unknown, KFileItem::Unknown, url);
-            fileItem.refresh();
-        } else {
-            fileItem = m_fileItem;
-        }
+        KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, file);
+        fileItem.refresh();
 
         if (fileItem.isDir()) {
             m_metaTextLabel->add(i18nc("@label", "Type:"), i18nc("@label", "Folder"));