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

List:       kde-commits
Subject:    KDE/kdelibs/khtml/misc
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-01-12 22:27:59
Message-ID: 1263335279.796539.21646.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073811 by orlovich:

Properly extract suggested filename from metaata for images.

BUG: 175782



 M  +5 -5      loader.cpp  


--- trunk/KDE/kdelibs/khtml/misc/loader.cpp #1073810:1073811
@@ -1152,7 +1152,7 @@
     fprintf(stderr, "PRELOADING %s\n", resource->url().string().toLatin1().data());
 #endif
 }
- 
+
 void DocLoader::clearPreloads()
 {
     printPreloadStats();
@@ -1184,7 +1184,7 @@
             fprintf(stderr,"HIT COMPLETE PRELOAD %s\n", \
                res->url().string().toLatin1().data());
         else if (res->preloadResult() == \
                CachedObject::PreloadReferencedWhileLoading)
             fprintf(stderr,"HIT LOADING PRELOAD %s\n", \
                res->url().string().toLatin1().data());
-        
+
         if (res->type() == CachedObject::Script) {
             scripts++;
             if (res->preloadResult() < CachedObject::PreloadReferencedWhileLoading)
@@ -1258,7 +1258,7 @@
       CachedSound* s = Cache::requestObject<CachedSound, CachedObject::Sound>( this, \
fullURL, 0 );  return s;
 }
-            
+
 CachedFont *DocLoader::requestFont( const DOM::DOMString &url )
 {
     DOCLOADER_SECCHECK(true);
@@ -1429,7 +1429,7 @@
     if (!r)
         return;
     CachedObject *o = r->object;
-    
+
     // Mozilla plain ignores any  mimetype that doesn't have / in it, and handles it \
                as "",
     // including when being picky about mimetypes. Match that for better \
compatibility with broken servers.  if (s.contains('/'))
@@ -1467,7 +1467,7 @@
       r->object->setExpireDate( expireDate );
 
       if ( r->object->type() == CachedObject::Image ) {
-          QString fn = j->queryMetaData("content-disposition");
+          QString fn = j->queryMetaData("content-disposition-filename");
           static_cast<CachedImage*>( r->object )->setSuggestedFilename(fn);
 #ifdef IMAGE_TITLES
           static_cast<CachedImage*>( r->object )->setSuggestedTitle(fn);


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