--- a/vpnengine/ikev1lib/src/ikev1pluginsession.cpp	Wed Sep 15 13:20:54 2010 +0300
+++ b/vpnengine/ikev1lib/src/ikev1pluginsession.cpp	Wed Oct 13 15:42:16 2010 +0300
@@ -902,7 +902,7 @@
 //    
 TInt CIkev1PluginSession::AuthDialogCompletedL( CAuthDialogInfo* aUserInfo )
     {
-    CIkev1Negotiation* negotiation = aUserInfo->iNegotiation;
+    CIkev1Negotiation* negotiation = FindNegotiation( aUserInfo->SAId() );
     if ( negotiation )
         {
         DEBUG_LOG1( _L("Dialog completed for SAID: %d"),
@@ -920,31 +920,6 @@
     return KErrNotFound;
     }
 
-// ---------------------------------------------------------------------------
-// Handles completion of error dialog processing.
-// ---------------------------------------------------------------------------
-//    
-TInt CIkev1PluginSession::ErrDialogCompletedL( CAuthDialogInfo* aUserInfo )
-    {
-    
-    CIkev1Negotiation* negotiation = aUserInfo->iNegotiation;
-    if ( negotiation )
-        {
-        DEBUG_LOG1( _L("Dialog completed for SAID: %d"),
-                aUserInfo->SAId() );
-        
-        negotiation->ErrDialogCompletedL();
-        if ( negotiation->Finished() )
-            {
-            DeleteNegotiation( negotiation );
-            }   
-        return KErrNone;
-        }   
-    DEBUG_LOG1( _L("Dialog completed, no negotiation found for SAID: %d"),
-            aUserInfo->SAId() );
-            
-    return KErrNotFound;    
-    }
 
 // ---------------------------------------------------------------------------
 // Handles change of internal address.
@@ -1078,16 +1053,6 @@
 MKmdEventLoggerIf& CIkev1PluginSession::EventLogger()
     {
     return iPlugin.EventLogger();
-    }
-
-// ---------------------------------------------------------------------------
-// Returns SoftToken interface.
-// ---------------------------------------------------------------------------
-//
-//MSoftTokenPluginIf* CIkev1PluginSession::SoftToken()
-CSoftTokenPluginIf* CIkev1PluginSession::SoftToken()
-    {
-    return iPlugin.SoftToken();
     }      
 
 // ---------------------------------------------------------------------------
@@ -1571,7 +1536,7 @@
                                                     aDestAddr,
                                                     aLocalPort,
                                                     aDscp );
-        iSendQueue.AppendL( item );  
+        iSendQueue.Append( item );                
         }        
     }