diff -r f56ec6ce2732 -r 6f9f6e99a23e mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp --- a/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Tue May 11 16:40:32 2010 +0300 +++ b/mmappcomponents/mmmtpdataprovider/mmmtpdprequestprocessor/src/csendobject.cpp Tue May 25 13:14:13 2010 +0300 @@ -129,7 +129,7 @@ PRINT1( _L( "MM MTP <> CSendObject::ConstructL DataProviderId = 0x%x" ), iFramework.DataProviderId()); - SetPSStatus(); + PRINT( _L( "MM MTP <= CSendObject::ConstructL" ) ); } @@ -324,6 +324,8 @@ EXPORT_C void CSendObject::ServiceL() { PRINT( _L( "MM MTP => CSendObject::ServiceL" ) ); + + MmMtpDpUtility::SetPSStatus(EMtpPSStatusActive); if ( iProgress == EObjectNone ) { @@ -596,7 +598,7 @@ // Commits into MTP data object enumeration store the object handle and // storage space previously reserved for the specified object. iFramework.ObjectMgr().CommitReservedObjectHandleL( *iReceivedObjectInfo ); - iRollbackList.Append( RemoveObjectFromDbL ); + iRollbackList.Append( &CSendObject::RemoveObjectFromDbL ); } // Commit object to MTP data store @@ -1139,7 +1141,7 @@ // by the specified object information record. TRAP( err, iObjectMgr.ReserveObjectHandleL( *iReceivedObjectInfo, iObjectSize ) ); - iRollbackList.Append( UnreserveObjectL ); + iRollbackList.Append( &CSendObject::UnreserveObjectL ); PRINT2( _L( "MM MTP => CSendObject::ReserveObjectL iObjectsize = %Lu, Operation: 0x%x" ), iObjectSize, iOperationCode ); if ( err != KErrNone ) @@ -1152,7 +1154,7 @@ delete iFileReceived; iFileReceived = NULL; PRINT2( _L( "MM MTP <> CSendObject::ServiceObjectL, iFullPath is %S, iObjectSize: %Lu" ), &iFullPath, iObjectSize ); - iRollbackList.Append( RemoveObjectFromFs ); + iRollbackList.Append( &CSendObject::RemoveObjectFromFs ); TRAP( err, iFileReceived = CMTPTypeFile::NewL( iFs, iFullPath, EFileWrite ) ); PRINT1( _L("MM MTP <> CMTPTypeFile::NewL Leave Code is: %d"), err ); @@ -1269,7 +1271,7 @@ TRAPD( err, AddMediaToStoreL() ); if ( err != KErrNone ) - iRollbackList.Append( RemoveObjectFromDbL ); + iRollbackList.Append( &CSendObject::RemoveObjectFromDbL ); else iRollbackList.Reset();