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