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

List:       kde-commits
Subject:    kdenox/konq-embed/dropin/khtml
From:       Luciano Montanaro <mikelima () cirulla ! net>
Date:       2005-07-29 9:23:40
Message-ID: 1122629020.757107.30697.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 439907 by montanaro:

Bettere mimetype handling. 


 M  +13 -5     khtml_run.cpp  


--- trunk/kdenox/konq-embed/dropin/khtml/khtml_run.cpp #439906:439907
@@ -30,19 +30,27 @@
 : KRun( url, 0, false, false /* No GUI */ ), m_part( part ),
   m_args( args ), m_child( child ), m_hideErrorDialog( hideErrorDialog )
 {
+    part->started(0);
 }
 
 void KHTMLRun::foundMimeType( const QString &_type )
 {
+    Q_ASSERT(!m_bFinished);
     QString mimeType = _type; // this ref comes from the job, we lose it when using KIO again
-    if ( !m_part->processObjectRequest( m_child, m_strURL, mimeType ) )
+    if ( static_cast<KHTMLPart *>(m_part)->processObjectRequest( m_child, m_strURL, mimeType ) )
+        m_bFinished = true;
+    else {
+        return;
+    }
+
+    if ( m_bFinished )
     {
-        kdDebug() << "KHTMLRun::foundMimeType " << _type << " couldn't open" << endl;
-        KRun::foundMimeType( mimeType );
+        m_timer.start( 0, true );
         return;
     }
-    m_bFinished = true;
-    m_timer.start( 0, true );
+
+    //kdDebug(6050) << "KHTMLRun::foundMimeType " << _type << " couldn't open" << endl;
+    KRun::foundMimeType( mimeType );
 }
 
 void KHTMLRun::slotJobResult( KIO::Job *job )
[prev in list] [next in list] [prev in thread] [next in thread]