From: David Faure <faure@kde.org>
Date: Tue, 18 Dec 2007 18:13:31 +0000 (+0000)
Subject: Fix discrepancy in total size between statusbar and infosidebarpage; reported by... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/00bded7c8d9c97dcaf726347d663032de3402b03

Fix discrepancy in total size between statusbar and infosidebarpage; reported by _mika, approved by Peter.

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

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index bed20b1f5..7b0d2d40c 100644
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -333,9 +333,10 @@ void InfoSidebarPage::showMetaInfo()
 
         unsigned long int totalSize = 0;
         foreach (const KFileItem& item, selectedItems) {
-            // TODO: what to do with directories (same with the one-item-selected-code)?,
-            // item.size() does not return the size of the content : not very instinctive for users
-            totalSize += item.size();
+            // Only count the size of files, not dirs; to match what
+            // DolphinViewContainer::selectionStatusBarText does.
+            if (!item.isDir() && !item.isLink())
+                totalSize += item.size();
         }
         addInfoLine(text, i18nc("@label", "Total size:"), KIO::convertSize(totalSize));
     }