--- a/eapol/eapol_framework/eapol_symbian/am/include/eap_am_type_mschapv2_symbian.h	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/include/eap_am_type_mschapv2_symbian.h	Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 16.1.8 %
+* %version: 18 %
 */
 
 #ifndef _EAP_AM_TYPE_MSCHAPV2_SYMBIAN_H_
@@ -27,8 +27,7 @@
 #include "abs_eap_base_type.h"
 #include "eap_am_type_mschapv2.h"
 #include "eap_type_mschapv2.h"
-#include "eap_auth_notifier.h"
-
+#include "EapMsChapV2NotifierStructs.h"
 #include <EapType.h>
 #include <d32dbms.h>
 
@@ -40,19 +39,14 @@
 */
 class EAP_EXPORT eap_am_type_mschapv2_symbian_c
 : public CActive, public eap_am_type_mschapv2_c
-	, public MNotificationCallback
-
-
 {
 private:
-
 	//--------------------------------------------------
-
 	eap_am_tools_symbian_c * const m_am_tools;
 
 	abs_eap_base_type_c * const m_partner;
 
-	RFs m_session;
+	RDbs m_session;
 
 	RDbNamedDatabase m_database;
 
@@ -64,7 +58,7 @@
 
 	TState m_state;
 
-
+	RNotifier m_notifier;
 
 	eap_variable_data_c * m_username_utf8;
 	eap_variable_data_c * m_password_utf8;
@@ -72,9 +66,8 @@
 	bool * m_password_prompt_enabled;
 	bool m_is_identity_query;
 
-	CEapAuthNotifier::TEapDialogInfo * m_username_password_io_ptr;
-	TPckg<CEapAuthNotifier::TEapDialogInfo> * m_username_password_io_pckg_ptr;
-
+	TEapMsChapV2UsernamePasswordInfo * m_username_password_io_ptr;
+	TPckg<TEapMsChapV2UsernamePasswordInfo> * m_username_password_io_pckg_ptr;
 
 	eap_am_network_id_c m_receive_network_id;
 
@@ -90,13 +83,18 @@
 
 	bool m_shutdown_was_called;
 	
-
+	bool m_is_notifier_connected; // Tells if notifier server is connected.
 
 	// This holds the max session time read from the configuration file.
 	TInt64 m_max_session_time;
 
-	CEapAuthNotifier* iEapAuthNotifier;
-
+	// This is the vendor-type for tunneling EAP type.
+	// Valid for both expanded and non-expanded EAP types.
+	// This is used since m_tunneling_type can not be used in the same way 
+	// in expanded and non-expanded cases. 
+	// Unlike EAP type, Tunneling type is still non-expanded
+	// for both cases especially for using in the EAP databases.
+	u32_t m_tunneling_vendor_type;	
 
 	void send_error_notification(const eap_status_e error);
 
@@ -204,10 +202,6 @@
 	 */
 	eap_status_e store_authentication_time();	
 
-	EAP_FUNC_IMPORT void DlgComplete( TInt aStatus );
-
-	TInt IsDlgReadyToCompleteL();
-
 }; // class eap_am_type_mschapv2_symbian_c