--- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp Mon Jan 18 21:20:18 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp Tue Feb 02 00:56:45 2010 +0200
@@ -831,17 +831,9 @@
if (m_instance && m_pluginfuncs) {
- NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(url, this, core(m_frame), notifydata);
+ NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(url, this, core(m_frame), notifydata, notify);
if (pluginloader) {
- pluginloader->start();
-
- if ( notify ) {
- HBufC* url16 = HBufC::NewLC( url.Length() );
- url16->Des().Copy( url );
- m_pluginfuncs->urlnotify( m_instance, *url16, NPRES_DONE, notifydata );
- CleanupStack::PopAndDestroy(url16);
- }
-
+ pluginloader->start();
}
}
}
@@ -923,17 +915,9 @@
if (loadmode == ELoadModePlugin ) {
if (m_instance && m_pluginfuncs) {
- NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(request, this, core(m_frame), notifydata);
+ NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(request, this, core(m_frame), notifydata, notify);
if (pluginloader) {
- pluginloader->start();
-
- if ( notify ) {
- HBufC* url16 = HBufC::NewLC( url.Length() );
- url16->Des().Copy( url );
- m_pluginfuncs->urlnotify( m_instance, *url16, NPRES_DONE, notifydata );
- CleanupStack::PopAndDestroy(url16);
- }
-
+ pluginloader->start();
}
}
}