--- a/egl/eglrefimpl/src/session.cpp	Fri Jul 02 12:05:03 2010 +0100
+++ b/egl/eglrefimpl/src/session.cpp	Fri Jul 02 18:48:10 2010 +0100
@@ -80,7 +80,7 @@
 
 CEglThreadSession::~CEglThreadSession()
 	{
-	delete iEgl;
+//Emilio	delete iEgl;
 	CEglDriver::Close();
 	}
 
@@ -142,8 +142,9 @@
 
     // default display is created when driver is initialised the first time and will
     // be destroyed when all threads within process have called eglReleaseThread
+    return do_eglGetDisplay(aDisplayId);
 
-    return KEglDefaultDisplayHandle;
+    //Emilio return KEglDefaultDisplayHandle;
     }
 void CEglThreadSession::SetEgl(EGL* aEgl)
 	{
@@ -177,7 +178,7 @@
         return EGL_FALSE;
         }
     
-    EGL* pEgl = NULL;
+    /* Emilio EGL* pEgl = NULL;
     
     try
     {
@@ -220,8 +221,9 @@
         {
         *aMinor = KEglMinorVersion;
         }
+	Emilio */
 
-    return EGL_TRUE;
+    return do_eglInitialize(aDisplay, aMajor, aMinor);
     }
 
 EGLBoolean CEglThreadSession::EglTerminate(EGLDisplay aDisplay)
@@ -242,7 +244,8 @@
     display->Terminate();
     iDriver.Unlock();
     
-    return EGL_TRUE;
+    return do_eglTerminate(aDisplay);
+  //Emilio  return EGL_TRUE;
     }
 
 TFuncPtrEglProc CEglThreadSession::EglGetProcAddress(const char* aName)