--- a/eapol/eapol_framework/eapol_symbian/am/type/protected_setup/symbian/plugin/src/EapProtectedSetup.cpp	Thu Aug 19 09:58:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/protected_setup/symbian/plugin/src/EapProtectedSetup.cpp	Tue Aug 31 15:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 11.1.2 %
+* %version: 19 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -40,9 +40,8 @@
 #include <EapTypeInfo.h>
 #include "eap_am_type_protected_setup_symbian.h"
 #include "EapProtectedSetupGlobal.h"
-#include "eap_am_trace_symbian.h"
-
-//#include "EapAkaDbUtils.h"
+#include "EapTraceSymbian.h"
+#include "EapConversion.h"
 
 #include "eap_am_tools_symbian.h"
 
@@ -96,7 +95,7 @@
 		(_L("CEapProtectedSetup::GetStackInterfaceL - Start")));
 
 	// Create AM
-	eap_am_type_protected_setup_symbian_c* amEapType = eap_am_type_protected_setup_symbian_c::NewL(
+	CEapAmProtectedSetupSymbian* amEapType = CEapAmProtectedSetupSymbian::NewL(
 		aTools, 
 		aPartner, 
 		iIndexType,
@@ -111,7 +110,7 @@
 	{
 	
 		EAP_TRACE_DEBUG_SYMBIAN(
-			(_L("ERROR: GetStackInterfaceL : eap_am_type_protected_setup_symbian_c(): failed.")));
+			(_L("ERROR: GetStackInterfaceL : CEapAmProtectedSetupSymbian(): failed.")));
 	
 		delete amEapType;
 		User::Leave(KErrNoMemory);
@@ -183,27 +182,18 @@
 }
 
 // ----------------------------------------------------------
-TInt CEapProtectedSetup::InvokeUiL()
-{
-	EAP_TRACE_DEBUG_SYMBIAN(
-		(_L("ERROR: CEapProtectedSetup::InvokeUiL - THIS IS NOT SUPPORTED")));
 
-	TInt buttonId(0);
- 
-	// This is a dummy function.
-	
-	return buttonId;
-}
+
 
 // ----------------------------------------------------------
-CEapTypeInfo* CEapProtectedSetup::GetInfoLC()
+
+CEapTypeInfo* CEapProtectedSetup::GetInfoL()
 {
 	CEapTypeInfo* info = new(ELeave) CEapTypeInfo(
 		(TDesC&)KReleaseDate, 
 		(TDesC&)KEapTypeVersion,
 		(TDesC&)KManufacturer);
 
-	CleanupStack::PushL(info);
 	return info;
 }
 
@@ -223,14 +213,20 @@
 
 // ----------------------------------------------------------
 
-void CEapProtectedSetup::SetTunnelingType(const TInt aTunnelingType)
+void CEapProtectedSetup::SetTunnelingType(const TEapExpandedType aTunnelingType)
 {
-	EAP_TRACE_DEBUG_SYMBIAN(
-		(_L("CEapProtectedSetup::SetTunnelingType - tunneling type=%d"),
-		aTunnelingType));
+	EAP_TRACE_DATA_DEBUG_SYMBIAN(
+		(EAPL("CEapProtectedSetup::SetTunnelingType - tunneling type"),
+		aTunnelingType.GetValue().Ptr(), aTunnelingType.GetValue().Length()));
+
+	eap_type_value_e aInternalType;
 
-	// Vendor id is eap_type_vendor_id_ietf always in this plugin.
-	iTunnelingType.set_eap_type_values(eap_type_vendor_id_ietf, aTunnelingType);
+	    TInt err = CEapConversion::ConvertExpandedEAPTypeToInternalType(
+	            &aTunnelingType,
+	            &aInternalType);
+
+	    iTunnelingType = aInternalType;
+
 }