diff -r d39add9822e2 -r 5bfc169077b2 webengine/osswebengine/WebKit/s60/plugins/PluginStream.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/PluginStream.cpp Tue Feb 02 00:56:45 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginStream.cpp Fri Mar 19 09:52:28 2010 +0200 @@ -203,7 +203,7 @@ } -void PluginStream::destroyStream(int reason, TDesC* failedUrl) +void PluginStream::destroyStream(int reason) { if (m_streamDestroyed) return; m_streamDestroyed = true; @@ -235,17 +235,8 @@ } - if ( m_pluginskin->getNPPluginFucs() ) { - - if (m_stream && m_pluginskin->getNPPluginFucs()->destroystream){ - m_pluginskin->getNPPluginFucs()->destroystream( m_pluginskin->getNPP(), m_stream, npreason); - if (m_loaderclient->notify() && m_pluginskin->getNPPluginFucs()->urlnotify) - m_pluginskin->getNPPluginFucs()->urlnotify( m_pluginskin->getNPP(), m_stream->url->Des(), npreason, m_notifydata); - } - - if(!m_stream && m_loaderclient->notify() && failedUrl && m_pluginskin->getNPPluginFucs()->urlnotify){ - m_pluginskin->getNPPluginFucs()->urlnotify( m_pluginskin->getNPP(), *failedUrl, npreason, m_notifydata); - } + if ( m_pluginskin->getNPPluginFucs() && m_pluginskin->getNPPluginFucs()->destroystream ) { + m_pluginskin->getNPPluginFucs()->destroystream( m_pluginskin->getNPP(), m_stream, npreason); } if (reason == KErrNone) {