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

List:       kde-commits
Subject:    branches/KDE/4.5/kdelibs/kio/kio
From:       Peter Penz <peter.penz19 () gmail ! com>
Date:       2010-07-15 15:33:41
Message-ID: 20100715153341.DA179AC73A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1150290 by ppenz:

For remote items the "IgnoreMaximumSize" plugin property should not be respected (see \
http://reviewboard.kde.org/r/4627). Thanks to Iamluc for the patch!

CCMAIL: luc@vieillescazes.net


 M  +13 -6     previewjob.cpp  


--- branches/KDE/4.5/kdelibs/kio/kio/previewjob.cpp #1150289:1150290
@@ -350,13 +350,20 @@
             const KIO::UDSEntry entry = \
                static_cast<KIO::StatJob*>(job)->statResult();
             d->tOrig = entry.numberValue( KIO::UDSEntry::UDS_MODIFICATION_TIME, 0 );
 
-            const KIO::filesize_t maximumSize = \
                d->currentItem.item.url().isLocalFile()
-                                                ? d->maximumLocalSize
-                                                : d->maximumRemoteSize;
-            const bool skipCurrentItem = !d->ignoreMaximumSize
-                && (KIO::filesize_t)entry.numberValue( KIO::UDSEntry::UDS_SIZE, 0 ) \
> maximumSize +            bool skipCurrentItem = false;
+            const KIO::filesize_t size = (KIO::filesize_t)entry.numberValue( \
KIO::UDSEntry::UDS_SIZE, 0 ); +            if \
(d->currentItem.item.url().isLocalFile()) +            {
+                skipCurrentItem = !d->ignoreMaximumSize && size > \
                d->maximumLocalSize
                 && !d->currentItem.plugin->property("IgnoreMaximumSize").toBool();
-            if (skipCurrentItem) {
+            }
+            else
+            {
+                // For remote items the "IgnoreMaximumSize" plugin property is not \
respected +                skipCurrentItem = !d->ignoreMaximumSize && size > \
d->maximumRemoteSize; +            }
+            if (skipCurrentItem)
+            {
                 d->determineNextFile();
                 return;
             }


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