--- a/vpnengine/ikev1lib/inc/ikev1trans.h	Thu Aug 19 10:54:34 2010 +0300
+++ b/vpnengine/ikev1lib/inc/ikev1trans.h	Tue Aug 31 16:14:16 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -63,8 +63,6 @@
 class TIkev1IsakmpStream;
 class MIkeDebug;
 class TInetAddr;
-class CCredentialCache;
-
 
 /**--------------------------------------------------------------------------
  *
@@ -102,7 +100,8 @@
     static TUint16 GetAuthMethod(TUint16 aAuthMethod, TBool aXauthUsed, TInt aRole);
     static void BuildXauthVendorId(TIkev1IsakmpStream &aMsg);
 
-	TInt DialogCompleteL(TAny* aUserInfo, HBufC8* aUsername, HBufC8* aSecret);
+	TInt DialogCompleteL(CIkev1Dialog* aDialog, TAny* aUserInfo, HBufC8* aUsername,
+	                     HBufC8* aSecret, HBufC8* aDomain);	
 	TInt BuildConfigRequestL();
     
 private:
@@ -129,8 +128,7 @@
                        CIkev1PluginSession* aPluginSession,
                        CIkev1Negotiation* aNegotiation,
                        MIkeDebug& aDebug );
-    void ConstructL();
-    void GetCredentialsL();
+    void ConstructL(); 
 
 private:
     CIkev1PluginSession* iPluginSession;
@@ -147,13 +145,9 @@
     TUint32 iRequestFlags;
     TBool   iXauthCompleted;
     TBool   iCfgModeCompleted;
-	TBool   iUseOlderPIXXauth;     // use draft-ietf-ipsec-isakmp-xauth-04.txt
-	TInt    iCredentialType; 
-
-    TLastIKEMsg iLastTransMsgInfo;
-    
-    CCredentialCache* iCache;
-
+	TBool   iUseOlderPIXXauth;     // use draft-ietf-ipsec-isakmp-xauth-04.txt  
+                                   
+    TLastIKEMsg iLastTransMsgInfo;    
     MIkeDebug& iDebug;
 };