--- a/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.cpp	Mon Mar 30 12:54:55 2009 +0300
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.cpp	Fri May 08 08:25:06 2009 +0300
@@ -22,7 +22,8 @@
 #include <e32std.h>
 #include <e32uid.h>
 #include <sysutil.h>
-#include "../../bidi.h"
+#include "config.h"
+#include "..\..\bidi.h"
 
 // System includes
 #include <ecom/ecom.h>
@@ -398,6 +399,8 @@
     : m_pluginInfoArray( KPluginGranularity )
       ,m_enablePlugins(enablePlugins)
       ,m_asyncLoading(ETrue)
+      ,m_pluginToActivate(NULL)
+      ,m_activePlugin(NULL)
 {
 }
 
@@ -440,6 +443,7 @@
 {
     m_pluginInfoArray.ResetAndDestroy();
     m_pluginInfoArray.Close();
+    m_pluginObjects.clear();
     if (m_idle) {
        m_idle->Cancel();
     }
@@ -885,4 +889,12 @@
     return isSupported;
 }
 
+void PluginHandler::storePluginObject(PluginSkin* pluginObj)
+{
+    m_pluginObjects.add(pluginObj);    
+}
+void  PluginHandler::removePluginObject(PluginSkin* pluginObj)
+{
+    m_pluginObjects.remove(pluginObj);    
+}
 //  End of File