--- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp	Fri May 08 08:25:06 2009 +0300
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp	Fri Jul 03 15:54:40 2009 +0100
@@ -306,24 +306,28 @@
 // ----------------------------------------------------------------------------
 void PluginSkin::pluginFocusChanged(TBool focus) 
 { 
-	  //Trigger Webview to notify all plugins about current view set to foreground/background for playing/pausing swf files (resp.)
-	  control(m_frame)->webView()->notifyPlugins(focus);
     if (control(m_frame)->webView()->pageFullScreenHandler() && 
         !control(m_frame)->webView()->pageFullScreenHandler()->isFullScreenMode()) 
             return;
     
     if (focus && !m_flashContent)
         {
+        TRAP_IGNORE(
         control(m_frame)->webView()->LeaveFullscreenBrowsingL();
-        control(m_frame)->webView()->notifyFullscreenModeChangeL( EFalse );        
+        control(m_frame)->webView()->notifyFullscreenModeChangeL( EFalse );
+        );
         }
     else if (focus)
         {
+        TRAP_IGNORE(
         control(m_frame)->webView()->pageFullScreenHandler()->showEscBtnL();
+        );
         }
     else 
         {
+        TRAP_IGNORE(
         control(m_frame)->webView()->pageFullScreenHandler()->hideEscBtnL();
+        );
         }
 }
 
@@ -460,20 +464,22 @@
                 // Set right soft key
                 m_frame->frameView()->topView()->brCtl()->updateDefaultSoftkeys();
                 pluginHandler->setActivePlugin(this);
+                pluginHandler->setPluginToActivate(NULL);
                 }
             }
         else
             {
             m_active = ETrue;
             pluginHandler->setActivePlugin(this);
-            m_frame->frameView()->topView()->openPluginPlayer(m_pluginwin);
+            TRAP_IGNORE( m_frame->frameView()->topView()->openPluginPlayerL(m_pluginwin));
             consumed = ETrue;
             m_active = EFalse;
             pluginHandler->setActivePlugin(NULL);
             }
     } else {
         if ( m_pluginSupported ) {
-            NetscapePlugInStreamLoaderClient* pluginloader = NetscapePlugInStreamLoaderClient::NewL(*m_url, this, core(m_frame));
+            NetscapePlugInStreamLoaderClient* pluginloader = NULL;
+            TRAP_IGNORE( pluginloader = NetscapePlugInStreamLoaderClient::NewL(*m_url, this, core(m_frame)));
             if (pluginloader) {
                 pluginloader->start();                            
             }                                                            
@@ -619,18 +625,6 @@
 }
 
 
-// -----------------------------------------------------------------------------
-// PluginSkin::ViewFocusChanged
-// From MViewFocusObserver
-// Callback from the view when the focus changes
-// -----------------------------------------------------------------------------
-void PluginSkin::viewFocusChanged(TBool focused)
-    {
-    if (m_pluginwin)
-        {
-        m_pluginwin->viewFocusChanged(focused);
-        }
-    }
 
 // -----------------------------------------------------------------------------
 // PluginSkin::PositionChanged
@@ -997,15 +991,6 @@
     
     return apId;
 }
-void PluginSkin::handlePluginForeground(TBool focus)
-{
-    // Send Plugin Visible/Invisible event
-    if (m_pluginwin)
-    {
-       m_pluginwin->NotifyPluginVisible(focus); 
-    }
-}
-
 
 TPluginLoadMode PluginSkin::GetLoadMode(const TDesC* aWindowType)
 {