equal
deleted
inserted
replaced
829 |
829 |
830 if( (loadmode == ELoadModePlugin ) || (url.FindF(KSwfExtn)!= KErrNotFound) ){ |
830 if( (loadmode == ELoadModePlugin ) || (url.FindF(KSwfExtn)!= KErrNotFound) ){ |
831 |
831 |
832 if (m_instance && m_pluginfuncs) { |
832 if (m_instance && m_pluginfuncs) { |
833 |
833 |
834 NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(url, this, core(m_frame), notifydata); |
834 NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(url, this, core(m_frame), notifydata, notify); |
835 if (pluginloader) { |
835 if (pluginloader) { |
836 pluginloader->start(); |
836 pluginloader->start(); |
837 |
|
838 if ( notify ) { |
|
839 HBufC* url16 = HBufC::NewLC( url.Length() ); |
|
840 url16->Des().Copy( url ); |
|
841 m_pluginfuncs->urlnotify( m_instance, *url16, NPRES_DONE, notifydata ); |
|
842 CleanupStack::PopAndDestroy(url16); |
|
843 } |
|
844 |
|
845 } |
837 } |
846 } |
838 } |
847 } |
839 } |
848 else { |
840 else { |
849 HBufC* windowType = HBufC::NewLC(aWindowType->Length()); |
841 HBufC* windowType = HBufC::NewLC(aWindowType->Length()); |
921 |
913 |
922 |
914 |
923 if (loadmode == ELoadModePlugin ) { |
915 if (loadmode == ELoadModePlugin ) { |
924 |
916 |
925 if (m_instance && m_pluginfuncs) { |
917 if (m_instance && m_pluginfuncs) { |
926 NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(request, this, core(m_frame), notifydata); |
918 NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(request, this, core(m_frame), notifydata, notify); |
927 if (pluginloader) { |
919 if (pluginloader) { |
928 pluginloader->start(); |
920 pluginloader->start(); |
929 |
|
930 if ( notify ) { |
|
931 HBufC* url16 = HBufC::NewLC( url.Length() ); |
|
932 url16->Des().Copy( url ); |
|
933 m_pluginfuncs->urlnotify( m_instance, *url16, NPRES_DONE, notifydata ); |
|
934 CleanupStack::PopAndDestroy(url16); |
|
935 } |
|
936 |
|
937 } |
921 } |
938 } |
922 } |
939 } |
923 } |
940 else { |
924 else { |
941 HBufC* windowType = HBufC::NewLC(aWindowType->Length()); |
925 HBufC* windowType = HBufC::NewLC(aWindowType->Length()); |