--- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Tue Feb 02 00:56:45 2010 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Fri Mar 19 09:52:28 2010 +0200
@@ -21,7 +21,7 @@
 #include "NpnImplementation.h"
 #include "PluginWin.h"
 #include "PluginSkin.h"
-#include <cuseragent.h>
+#include <CUserAgent.h>
 #include <Element.h>
 #include <HTMLPlugInElement.h>
 #include <HTMLNames.h>
@@ -481,20 +481,8 @@
             {
             PluginWin* pluginWin = (PluginWin*)aInstance->ndata;
             if (pluginWin) {
-            TPoint* cursorPos; 
-            
-            //EPMR-7XPHXV aSetValue is set as "(void*) 1" from
-            //"CBrowserPluginControl::GoNormalScreenL" from the flash plugin
-            //to avoid the Invalid pointer access, we are checking for 
-            //aSetValue and setting point as (0,0) and also for NULL Value 
-            if((aSetValue == (void*)1) || (!aSetValue)) {
-                TPoint position(0,0);
-                cursorPos = static_cast<TPoint*>(&position);
-                }
-                else {
-                cursorPos = static_cast<TPoint*>(aSetValue);
-                }
-            pluginWin->pluginDeactivate(*cursorPos);
+                TPoint* cursorPos = static_cast<TPoint*>(aSetValue);
+                pluginWin->pluginDeactivate(*cursorPos);
             }
         }
         break;