--- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/ccopyobject.cpp	Thu Jul 15 19:11:42 2010 +0300
+++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/ccopyobject.cpp	Thu Aug 19 10:24:28 2010 +0300
@@ -310,9 +310,9 @@
     SetPreviousPropertiesL();
 
     CFileMan* fileMan = CFileMan::NewL( iFramework.Fs() );
+    CleanupStack::PushL( fileMan ); // + fileMan
     User::LeaveIfError( fileMan->Copy( oldFileName, aNewFileName ) );
-    delete fileMan;
-    fileMan = NULL;
+    CleanupStack::PopAndDestroy( fileMan ); // - fileMan
 
     PRINT( _L( "MM MTP <= CCopyObject::CopyFileL" ) );
     return handle;
@@ -417,8 +417,6 @@
     {
     PRINT( _L( "MM MTP => CCopyObject::SetPreviousPropertiesL" ) );
 
-    TMTPResponseCode respcode = EMTPRespCodeOK;
-
     iPropertyList->ResetCursor();
     const TInt count = iPropertyList->NumberOfElements();
     for ( TInt i = 0; i < count; i++ )
@@ -460,7 +458,7 @@
                 {
                 CMTPTypeString *stringData = CMTPTypeString::NewLC( element.StringL( CMTPTypeObjectPropListElement::EValue ) ); // + stringData
 
-                respcode = iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
+                iDpConfig.PropSettingUtility()->SetMetaDataToWrapper( iDpConfig,
                     propertyCode,
                     *stringData,
                     *iTargetObject );
@@ -471,7 +469,7 @@
 
             default:
                 {
-                respcode = iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
+                iDpConfig.PropSettingUtility()->SetSpecificObjectPropertyL( iDpConfig,
                     propertyCode,
                     *iTargetObject,
                     element );
@@ -480,13 +478,7 @@
             }
         } // end of for loop
 
-    // ignore errors
-    if ( respcode == EMTPRespCodeOK )
-        {
-        // do nothing, just to get rid of build warning
-        }
-
-    PRINT1( _L( "MM MTP <= CCopyObject::SetPreviousPropertiesL respcode = 0x%x" ), respcode );
+    PRINT( _L( "MM MTP <= CCopyObject::SetPreviousPropertiesL" ) );
     }
 
 // -----------------------------------------------------------------------------