[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kio/kfile
From:       Pascal Létourneau <pletourn () globetrotter ! net>
Date:       2005-03-17 16:10:36
Message-ID: 20050317161036.94B791853F () office ! kde ! org
[Download RAW message or body]

CVS commit by pletourn: 

Don't assume there is a '.' entry, i.e for tar:/


  M +4 -2      kdirsize.cpp   1.15


--- kdelibs/kio/kfile/kdirsize.cpp  #1.14:1.15
@@ -76,9 +76,9 @@ void KDirSize::startNextJob( const KURL 
                                 const KIO::UDSEntryList& )));
     addSubjob( listJob );
-    m_totalSubdirs--; //decrement 1 to account for current directory
 }
 
 void KDirSize::slotEntries( KIO::Job*, const KIO::UDSEntryList & list )
 {
+    static const QString& dot = KGlobal::staticQString( "." );
     static const QString& dotdot = KGlobal::staticQString( ".." );
     KIO::UDSEntryListConstIterator it = list.begin();
@@ -108,5 +108,7 @@ void KDirSize::slotEntries( KIO::Job*, c
           }
         }
-        if ( name != dotdot ) // i.e. name != ".."
+        if ( name == dot )
+            m_totalSize += size;
+        else if ( name != dotdot )
         {
             if (!isLink)


[prev in list] [next in list] [prev in thread] [next in thread]