fixed problems with wrong space information (I'll backport the fix to 4.0.x on Tuesda...

BUG: 153778
BUG: 156271
BUG: 155608

svn path=/trunk/KDE/kdebase/apps/; revision=781211

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index 1d1ca0240dd4978298d8db239b05adf1fd22b7de..3a2f77aef8c4ebf19541fc49c5fd8e31e0e1fb4d 100644 (file)
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -73,7 +73,7 @@ void StatusBarSpaceInfo::slotFoundMountPoint(const QString& mountPoint,
                                (kBAvailable != static_cast<quint64>(maximum()));
     if (valuesChanged) {
         m_text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(kBAvailable));
                                (kBAvailable != static_cast<quint64>(maximum()));
     if (valuesChanged) {
         m_text = i18nc("@info:status", "%1 free", KIO::convertSizeFromKiB(kBAvailable));

-        setMaximum(kBAvailable);
+        setMaximum(kBSize);

         setValue(kBUsed);
     }
 }
         setValue(kBUsed);
     }
 }


@@ -82,6 +82,8 @@ void StatusBarSpaceInfo::refresh()
 {
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {
 {
     // KDiskFreeSpace is for local paths only
     if (!m_url.isLocalFile()) {

+        m_text = i18nc("@info:status", "Unknown size");
+        update();

         return;
     }
 
         return;
     }
 


@@ -114,6 +116,7 @@ void StatusBarSpaceInfo::showGettingSizeInfo()
 {
     if (m_gettingSize) {
         m_text = i18nc("@info:status", "Getting size...");
 {
     if (m_gettingSize) {
         m_text = i18nc("@info:status", "Getting size...");

+        update();

         setMinimum(0);
         setMaximum(0);
     }
         setMinimum(0);
         setMaximum(0);
     }