diff -r 8f0df5c82986 -r 67eb01668b0e videocollection/mpxmyvideoscollection/src/vcxmyvideosmessagelist.cpp --- a/videocollection/mpxmyvideoscollection/src/vcxmyvideosmessagelist.cpp Tue May 25 12:44:54 2010 +0300 +++ b/videocollection/mpxmyvideoscollection/src/vcxmyvideosmessagelist.cpp Wed Jun 09 09:44:23 2010 +0300 @@ -106,7 +106,7 @@ MPX_DEBUG1("CVcxMyVideosMessageList:: ----------------------------------------------'" ); #endif - if ( AlreadyInMessageListL( aId, aChange, aExtraInfo ) ) + if ( aChange == EMPXItemModified && AlreadyInMessageListL( aId, aChange, aExtraInfo ) ) { MPX_DEBUG1("CVcxMyVideosMessageList:: already in message list, skipping add"); return; @@ -130,7 +130,7 @@ { message->SetTObjectValueL( KVcxMediaMyVideosInt32Value, aExtraInfo ); } - + MPX_DEBUG1("CVcxMyVideosMessageList:: appending to message array"); iMessageArray->AppendL( message ); // ownership moves @@ -189,6 +189,24 @@ { extraInfo = media->ValueTObjectL( KVcxMediaMyVideosInt32Value ); } + + if ( extraInfo == EVcxMyVideosVideoListOrderChanged && + aExtraInfo == 0 ) + { + MPX_DEBUG1("CVcxMyVideosMessageList:: found similar message with EVcxMyVideosVideoListOrderChanged flag set, discarding this msg"); + return ETrue; + } + + if ( aExtraInfo == EVcxMyVideosVideoListOrderChanged && + extraInfo == 0 ) + { + MPX_DEBUG1("CVcxMyVideosMessageList:: Turning the EVcxMyVideosVideoListOrderChanged flag on to the previous message"); + MPX_DEBUG1("CVcxMyVideosMessageList:: and discarding this."); + media->SetTObjectValueL( KVcxMediaMyVideosInt32Value, + EVcxMyVideosVideoListOrderChanged ); + return ETrue; + } + if ( aExtraInfo == extraInfo ) { return ETrue; @@ -271,7 +289,7 @@ // void CVcxMyVideosMessageList::SendL() { - MPX_FUNC("CVcxMyVideosMessageList::SendL()"); + MPX_DEBUG1("CVcxMyVideosMessageList::SendL"); if ( iMessageCount == 0 || !iMessageList ) { @@ -299,9 +317,7 @@ iMessageList->SetTObjectValueL(KMPXMessageGeneralId, KVcxCommandIdMyVideos); iMessageList->SetTObjectValueL(KVcxMediaMyVideosCommandId, KVcxMessageMyVideosMessageArray ); - iMessageList->SetTObjectValueL(KMPXMessageCollectionId, TUid::Uid(KVcxUidMyVideosMpxCollection)); - //iMessageList->SetTObjectValueL(KMPXMessageChangeEventType, aChange); - //iMessageList->SetTObjectValueL(KMPXMessageMediaGeneralId, TMPXItemId(0, 0) ); + iMessageList->SetTObjectValueL(KMPXMessageCollectionId, TUid::Uid(KVcxUidMyVideosMpxCollection)); iMessageCount = 0; } }