--- a/eapol/eapol_framework/eapol_symbian/eap_server/src/EapScheduler.cpp	Thu May 27 13:25:51 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/eap_server/src/EapScheduler.cpp	Thu Jun 10 16:12:28 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 15 %
+* %version: 16 %
 */
 
 #include "EapScheduler.h"
@@ -128,7 +128,9 @@
     // get cleanup stack
     EAP_TRACE_DEBUG_SYMBIAN((_L("CEapScheduler::ThreadStart()")));           
 
+#if defined(USE_EAP_HEAP_CHECK)
     __UHEAP_MARK;
+#endif //#if defined(USE_EAP_HEAP_CHECK)
 
     CTrapCleanup* cleanup=CTrapCleanup::New();
 
@@ -140,7 +142,9 @@
 		delete cleanup;
 		}
 
+#if defined(USE_EAP_HEAP_CHECK)
     __UHEAP_MARKEND;
+#endif //#if defined(USE_EAP_HEAP_CHECK)
 
     EAP_TRACE_DEBUG_SYMBIAN((_L("CEapScheduler::ThreadStart end err=%d"), err));           
     return err;

--- a/eapol/eapol_framework/eapol_symbian/eap_server/src/EapSession.cpp	Thu May 27 13:25:51 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/eap_server/src/EapSession.cpp	Thu Jun 10 16:12:28 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 29 %
+* %version: 30 %
 */
 
 
@@ -192,11 +192,6 @@
 			ECapabilityNetworkControl,
 			"EAP-SERVER: Missing ECapabilityNetworkControl");
 #endif
-		CheckCapabilityL(
-			aMessage,
-			ETrue,
-			ECapabilityNetworkServices,
-			"EAP-SERVER: Missing ECapabilityNetworkServices");
 
 		CheckCapabilityL(
 			aMessage,
@@ -207,8 +202,8 @@
 		CheckCapabilityL(
 			aMessage,
 			ETrue,
-			ECapabilityReadUserData,
-			"EAP-SERVER: Missing ECapabilityReadUserData");
+			ECapabilityWriteDeviceData,
+			"EAP-SERVER: Missing ECapabilityWriteDeviceData");
 	}
 
 

--- a/securitysettings/eapqtdialogs/eapqtdialogs.pro	Thu May 27 13:25:51 2010 +0300
+++ b/securitysettings/eapqtdialogs/eapqtdialogs.pro	Thu Jun 10 16:12:28 2010 +0300
@@ -46,8 +46,7 @@
     pluginstub.path = /resource/plugins/devicedialogs
     DEPLOYMENT += pluginstub
 }
-TRANSLATIONS = cellularpromptdialog.ts
+TRANSLATIONS = eapprompts.ts
 
 LIBS  += -leapqtconfiginterface -leapqtplugininfo
 
-# RESOURCES += res/eapdialog.qrc
\ No newline at end of file