diff -r b0aebde9b1fb -r 9e2a905b887f btobexprofiles/obexserviceman/utils/src/obexutilsentryhandler.cpp
--- a/btobexprofiles/obexserviceman/utils/src/obexutilsentryhandler.cpp	Mon Jul 12 19:25:26 2010 +0300
+++ b/btobexprofiles/obexserviceman/utils/src/obexutilsentryhandler.cpp	Fri Jul 23 15:57:13 2010 +0300
@@ -81,7 +81,8 @@
     
     iStatus = KRequestPending;
   
-    TRAPD(error, DoAddEntryAttachmentL(aFilePath, anAttachInfo, aStore));
+    TRAPD(error, aStore->AttachmentManagerL().AddLinkedAttachmentL(aFilePath,anAttachInfo, iStatus););
+    
     if (error != KErrNone )
         {        
         //Complete request
@@ -98,76 +99,6 @@
 
 
 // ---------------------------------------------------------------------------
-// DoAddLinkAttachmentL()
-// ---------------------------------------------------------------------------
-//
-void CObexutilsEntryhandler::DoAddEntryAttachmentL(
-    const TDesC &aFilePath, 
-    CMsvAttachment* anAttachInfo, 
-    CMsvStore* aStore)
-    {
-    FLOG(_L("[OBEXUTILS]\t CObexutilsEntryhandler::DoAddEntryAttachmentL()"));   
-        
-    aStore->AttachmentManagerL().AddLinkedAttachmentL(aFilePath,anAttachInfo, iStatus);
-    
-    //Complete request
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);
-        
-    FLOG(_L("[OBEXUTILS]\t CObexutilsEntryhandler::DoAddEntryAttachmentL() completed"));  
-    }
-
-// ---------------------------------------------------------------------------
-// UpdateLinkAttachment()
-// ---------------------------------------------------------------------------
-//
-TInt CObexutilsEntryhandler::UpdateEntryAttachment(
-    TFileName& aFileName,
-    CMsvAttachment* anOldAttachInfo,
-    CMsvAttachment* aNewAttachInfo,
-    CMsvStore* aStore)
-    {
-    FLOG(_L("[OBEXUTILS]\t CObexutilsEntryhandler::UpdateEntryAttachment()"));       
-    
-    iStatus = KRequestPending;
-  
-    TRAPD(error, DoUpdateEntryAttachmentL(aFileName,anOldAttachInfo, aNewAttachInfo, aStore));
-    if (error != KErrNone )
-        {        
-        //Complete request
-        TRequestStatus* status = &iStatus;
-        User::RequestComplete(status, error);
-        }
-       
-    SetActive();
-    iSyncWaiter.Start();
-          
-    FLOG(_L("[OBEXUTILS]\t CObexutilsEntryhandler::UpdateEntryAttachment() Done"));
-    return iStatus.Int();
-    }
-
-// ---------------------------------------------------------------------------
-// DoUpdateEntryAttachmentL()
-// ---------------------------------------------------------------------------
-//
-void CObexutilsEntryhandler::DoUpdateEntryAttachmentL(
-    TFileName& aFileName,
-    CMsvAttachment* anOldAttachInfo,
-    CMsvAttachment* aNewAttachInfo,
-    CMsvStore* aStore)
-    {
-    FLOG(_L("[OBEXUTILS]\t CObexutilsEntryhandler::DoUpdateEntryAttachmentL()"));   
-    aStore->AttachmentManagerL().RemoveAttachmentL(anOldAttachInfo->Id(), iStatus);
-    aStore->AttachmentManagerL().AddLinkedAttachmentL(aFileName,aNewAttachInfo, iStatus);
-   
-    //Complete request
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);
-        
-    FLOG(_L("[OBEXUTILS]\t CObexutilsEntryhandler::DoUpdateEntryAttachmentL() completed"));  
-    }
-
-// ---------------------------------------------------------------------------
 // From class CActive.
 // RunL()
 // ---------------------------------------------------------------------------