--- a/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsession.cpp	Thu Aug 19 10:44:50 2010 +0300
+++ b/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsession.cpp	Tue Aug 31 16:04:06 2010 +0300
@@ -30,8 +30,6 @@
 #include "NSmlAdapterLog.h"
 #include "nsmldshostconstants.h"
 #include "Nsmldshostserver.h"
-#include "Nsmldshostsessioncanceleventhandler.h"
-#include "Nsmldshostsessioncancel.h"
 #include "Nsmldshostsession.h"
 #include "nsmldsdpinformation.h"
 #include "Nsmldsdataproviderarray.h"
@@ -176,16 +174,6 @@
     iMemPtr.iChunk.Close();
     iDataProviders.ResetAndDestroy();
     iStringPool.Close();
-    if(iDsoDeleteAll)
-      {
-      delete iDsoDeleteAll;
-      iDsoDeleteAll = NULL;
-      }   
-    if(iCancelEventHandler)
-        {
-        delete iCancelEventHandler;
-        iCancelEventHandler = NULL;
-        }
     REComSession::FinalClose();
     iServer.DecSessionCount();
 	_DBG_FILE( "CNSmlDSHostSession::~CNSmlDSHostSession(): end" );
@@ -422,8 +410,6 @@
 	{
 	_DBG_FILE( "CNSmlDSHostSession::ConstructL(): begin" );
     iStringPool.OpenL();
-	iDsoDeleteAll = NULL;
-	iCancelEventHandler = NULL;
 	_DBG_FILE( "CNSmlDSHostSession::ConstructL(): end" );
 	}
 	
@@ -869,7 +855,7 @@
     	}
     
     CNSmlDSAsyncCallBackForOpen* p = new ( ELeave ) CNSmlDSAsyncCallBackForOpen( 
-    	this, aMessage, OpenFinishedL );
+    	this, aMessage, &CNSmlDSHostSession::OpenFinishedL );
     CleanupStack::PushL( p );
     
     p->iDpi = DataProviderItemL( aMessage.Int0() );
@@ -1038,7 +1024,7 @@
     RArray<TInt>* resultArray = new ( ELeave ) RArray<TInt>;
     CleanupStack::PushL( resultArray );
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CommitBatchRequestFinishedL, resultArray );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CommitBatchRequestFinishedL, resultArray );
     CleanupStack::Pop( resultArray ); //dsao takes ownership
     
     CleanupStack::PushL( dsao );
@@ -1176,7 +1162,7 @@
     CNSmlServerDSHostItem* dshi = DataStoreItemParamsLC();
     
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, OpenItemRequestFinishedL, dshi );
+    	this, dsi, aMessage, &CNSmlDSHostSession::OpenItemRequestFinishedL, dshi );
     CleanupStack::Pop( dshi ); //dsao takes ownership
     CleanupStack::PushL( dsao );
     
@@ -1258,7 +1244,7 @@
     TNSmlDSDataStoreElement* dsi = DataStoreItemL( aMessage );
     CNSmlServerDSHostItem* dshi = DataStoreItemParamsLC();
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CreateItemRequestFinishedL, dshi );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CreateItemRequestFinishedL, dshi );
     CleanupStack::Pop( dshi ); //dsao takes ownership
     CleanupStack::PushL( dsao );
     
@@ -1395,7 +1381,7 @@
     TNSmlDSDataStoreElement* dsi = DataStoreItemL( aMessage );
 
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CommitItemRequestFinishedL );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CommitItemRequestFinishedL );
     CleanupStack::PushL( dsao );
     dsao->CallDSAsyncLC().CommitItemL( dsao->iStatus );
     CleanupStack::Pop(2); //CallDSAsyncLC, dsao
@@ -1500,14 +1486,11 @@
 // ------------------------------------------------------------------------------------------------	
 void CNSmlDSHostSession::DeleteAllItemsL( const RMessage2& aMessage )
 	{
-    //Create cancel event handler
-    iCancelEventHandler = CNSmlHostSessionCancel::NewL(this);
     TNSmlDSDataStoreElement* dsi = DataStoreItemL( aMessage );
-    CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( this, dsi, aMessage, DeleteAllFinishedL );
+    CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( this, dsi, aMessage );
     CleanupStack::PushL( dsao );
-    dsao->CallDSAsyncLC().DeleteAllItemsL( dsao->iStatus );   
+    dsao->CallDSAsyncLC().DeleteAllItemsL( dsao->iStatus );
     CleanupStack::Pop(2); //CallDSAsyncLC(), dsao
-    iDsoDeleteAll = dsao;
 	}
 
 // ------------------------------------------------------------------------------------------------
@@ -1639,7 +1622,7 @@
 	TNSmlDSDataStoreElement* dsi = DataStoreItemL( aMessage );
 	
     CNSmlDSChangedItemsFetcher* dsao = CNSmlDSChangedItemsFetcher::NewLC( 
-    	this, dsi, aMessage, AllItemsRequestFinishedL );
+    	this, dsi, aMessage, &CNSmlDSHostSession::AllItemsRequestFinishedL );
     dsao->FetchAllChangedItemsL();
     CleanupStack::Pop(); //dsao
 	}
@@ -1690,7 +1673,7 @@
     CleanupStack::PopAndDestroy(); //readStream
     
     CNSmlDSAsyncCallBack* dsao = new ( ELeave ) CNSmlDSAsyncCallBack( 
-    	this, dsi, aMessage, CommitChangesRequestFinishedL, dius );
+    	this, dsi, aMessage, &CNSmlDSHostSession::CommitChangesRequestFinishedL, dius );
     CleanupStack::Pop( dius ); //dsao takes the ownership.
     CleanupStack::PushL( dsao );
     dsao->CallDSAsyncLC().CommitChangeInfoL( dsao->iStatus, *dius );
@@ -1908,46 +1891,4 @@
 	CleanupStack::PopAndDestroy(); //wStream
 	}
 
-// ------------------------------------------------------------------------------------------------
-// CNSmlDSHostSession::HandleCancelEventL
-// called when user canceled the operation
-// ------------------------------------------------------------------------------------------------ 
-void CNSmlDSHostSession::HandleCancelEventL()
-    {
-    if(iCancelEventHandler)
-        {
-        iDsoDeleteAll->Cancel();
-        }
-    }
-
-// ------------------------------------------------------------------------------------------------
-// CNSmlDSHostSession::DeleteAllFinishedL
-// called when DeleteAll request is finished.
-// Note! when aOperation is CNSmlDSAsyncCallBack::ECanceled or CNSmlDSAsyncCallBack::EFree, 
-// aDSAO->iDSItem might be NULL.
-// ------------------------------------------------------------------------------------------------ 
-TInt CNSmlDSHostSession::DeleteAllFinishedL( CNSmlDSAsyncCallBack* aDSAO, TCallBackOperation aOperation )
-    {
-    TInt err( aDSAO->iStatus.Int() );
-
-    switch( aOperation )
-        {
-        case CNSmlDSAsyncCallBack::EFinished:
-        case CNSmlDSAsyncCallBack::ECanceled:
-        case CNSmlDSAsyncCallBack::EFree:
-            {
-            if(iCancelEventHandler)
-                {
-                delete iCancelEventHandler;
-                iCancelEventHandler = NULL;
-                iDsoDeleteAll = NULL;
-                }
-            break;
-            }
-        default:
-            User::Leave( KErrUnknown );
-        };
-
-    return err;
-    }
 // End of File