diff -r 3b7506f63335 -r f3d2589f22d6 mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp Wed Jun 16 16:05:08 2010 +0100 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/cdeleteobject.cpp Thu Jul 22 16:38:21 2010 +0100 @@ -64,7 +64,6 @@ void CDeleteObject::ConstructL() { CActiveScheduler::Add( this ); - SetPSStatus(); } // ----------------------------------------------------------------------------- @@ -104,6 +103,8 @@ // EXPORT_C void CDeleteObject::ServiceL() { + MmMtpDpUtility::SetPSStatus( EMtpPSStatusActive ); + iObjectsToDelete.Reset(); iDeleteError = KErrNone; TUint32 objectHandle = Request().Uint32( TMTPTypeRequest::ERequestParameter1 ); @@ -125,7 +126,6 @@ { iIsMultiDelete = EFalse; // Not Owned the object - // TODO: need to check if this is best way and if it is applicable to other processors CMTPObjectMetaData* objectInfo = iRequestChecker->GetObjectInfo( objectHandle ); if ( objectInfo->Uint( CMTPObjectMetaData::EFormatCode ) == EMTPFormatCodeAssociation ) @@ -191,8 +191,9 @@ TUint32 handle = iObjectsToDelete[0]; iFramework.ObjectMgr().ObjectL( handle, *objectInfo ); - TFileName fileName( objectInfo->DesC( CMTPObjectMetaData::ESuid ) ); - PRINT2( _L( "MM MTP <> CDeleteObject::RunL delete object handle is 0x%x, fileName is %S" ), handle, &fileName ); + PRINT2( _L( "MM MTP <> CDeleteObject::RunL delete object handle is 0x%x, fileName is %S" ), + handle, + &( objectInfo->DesC( CMTPObjectMetaData::ESuid ) ) ); if ( objectInfo->Uint( CMTPObjectMetaData::EFormatCode ) == EMTPFormatCodeAssociation ) { @@ -221,11 +222,9 @@ // void CDeleteObject::DeleteObjectL( const CMTPObjectMetaData& aObjectInfo ) { - TFileName fileName( aObjectInfo.DesC( CMTPObjectMetaData::ESuid ) ); + TPtrC fileName( aObjectInfo.DesC( CMTPObjectMetaData::ESuid ) ); PRINT1( _L( "MM MTP <> CDeleteObject::DeleteObjectL fileName = %S" ), &fileName ); - iDpConfig.GetWrapperL().SetStorageRootL( fileName ); - // To capture special situation: After copy, move, rename playlist folder name, // record in MPX is not inlined with framework db, playlist should not be deleted // until next session.