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

List:       kde-commits
Subject:    KDE/kdelibs/khtml
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2007-10-23 21:20:35
Message-ID: 1193174435.507269.20783.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 728649 by carewolf:

Handle content-disposition from frames inside frames too.
BUG: 125870


 M  +6 -3      khtml_part.cpp  


--- trunk/KDE/kdelibs/khtml/khtml_part.cpp #728648:728649
@@ -1990,7 +1990,7 @@
       d->m_bFirstData = false;
 
       // ### this is still quite hacky, but should work a lot better than the old \
                solution
-      if (d->m_decoder->visuallyOrdered()) 
+      if (d->m_decoder->visuallyOrdered())
           d->m_doc->setVisuallyOrdered();
       d->m_doc->recalcStyle( NodeImpl::Force );
 }
@@ -4439,11 +4439,14 @@
     if ( child->m_type != khtml::ChildFrame::Object )
     {
       QString suggestedFileName;
-      if ( child->m_run )
+      int disposition = 0;
+      if ( child->m_run ) {
         suggestedFileName = child->m_run->suggestedFileName();
+        disposition = (child->m_run->serverSuggestsSave()) ? \
KParts::BrowserRun::AttachmentDisposition : KParts::BrowserRun::InlineDisposition; +  \
}  
       KParts::BrowserRun::AskSaveResult res = KParts::BrowserRun::askEmbedOrSave(
-        url, mimetype, suggestedFileName  );
+        url, mimetype, suggestedFileName, disposition );
       switch( res ) {
       case KParts::BrowserRun::Save:
         KHTMLPopupGUIClient::saveURL( widget(), i18n( "Save As" ), url, \
child->m_args.metaData(), QString(), 0, suggestedFileName );


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