--- a/eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_observer.cpp	Thu Jun 10 16:12:28 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/eap_notifier/src/eap_auth_observer.cpp	Thu Jun 24 11:23:08 2010 +0300
@@ -26,12 +26,11 @@
 // ---------------------------------------------------------
 //
 CEapAuthObserver* CEapAuthObserver::NewL( 
-    CEapAuthNotifier* aNotifier,
-    CEapAuthNotifier::EEapNotifierType aType )
+    CEapAuthNotifier* aNotifier )
     {
     RDebug::Print(_L("CEapAuthObserver::NewL") );
     
-    CEapAuthObserver* self = new ( ELeave ) CEapAuthObserver( aNotifier, aType );
+    CEapAuthObserver* self = new ( ELeave ) CEapAuthObserver( aNotifier );
     return self;
     }
 
@@ -40,10 +39,8 @@
 // ---------------------------------------------------------
 //
 CEapAuthObserver::CEapAuthObserver( 
-    CEapAuthNotifier* aNotifier,
-    CEapAuthNotifier::EEapNotifierType aType ): 
-    iNotifier( aNotifier ),
-    iType(aType)
+    CEapAuthNotifier* aNotifier  ): 
+    iNotifier( aNotifier )
     {
     RDebug::Print(_L("CEapAuthObserver::CEapAuthObserver") );
     }
@@ -58,6 +55,17 @@
     }
 
 // ---------------------------------------------------------
+// CEapAuthObserver::SetNotifierType
+// ---------------------------------------------------------
+//
+void CEapAuthObserver::SetNotifierType( CEapAuthNotifier::EEapNotifierType aType )
+    {
+    RDebug::Print(_L("CEapAuthObserver::setNotifierType") );
+    
+    iType = aType;
+    }
+
+// ---------------------------------------------------------
 // void CEapAuthObserver::DataReceived
 // ---------------------------------------------------------
 //
@@ -90,14 +98,14 @@
         RDebug::Print(_L("CEapAuthObserver::DataReceived: EEapNotifierTypeMsChapV2UsernamePasswordDialog") );
         UsernamePasswordDlgDataReceived(aData);
         }
-    else if ( iType == CEapAuthNotifier::EEapNotifierTypeGTCSecurIDPasscodeQueryUidDialog )
+    else if ( iType == CEapAuthNotifier::EEapNotifierTypeGTCQueryDialog )
         {
-        RDebug::Print(_L("CEapAuthObserver::DataReceived: EEapNotifierTypeGTCSecurIDPasscodeQueryUidDialog") ); 
+        RDebug::Print(_L("CEapAuthObserver::DataReceived: EEapNotifierTypeGTCQueryDialog") ); 
         PwdQueryDataReceived(aData);
         }
-    else if ( iType == CEapAuthNotifier::EEapNotifierTypePapChallengeReplyQueryDialog )
+    else if ( iType == CEapAuthNotifier::EEapNotifierTypePapAuthQueryDialog )
         {
-        RDebug::Print(_L("CEapAuthObserver::DataReceived: EEapNotifierTypePapChallengeReplyQueryDialog") ); 
+        RDebug::Print(_L("CEapAuthObserver::DataReceived: EEapNotifierTypePapAuthQueryDialog") ); 
         PwdQueryDataReceived(aData);
         }
     else if ( iType == CEapAuthNotifier::EEapNotifierTypeFastPacStorePwQueryDialog )