diff -r eedf17a17c27 -r cfd5c2994f10 imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp --- a/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp Thu Aug 19 10:14:19 2010 +0300 +++ b/imservices/instantmessagingcache/imcacheserver/src/cimcachesession.cpp Tue Aug 31 15:31:29 2010 +0300 @@ -241,14 +241,7 @@ if( iPacketsArray.Count() ) { CIMCacheBufferArray* packet = iPacketsArray[ 0 ] ; - if( packet->OperationCode() == EIMOperationFetchAll ) - { - iObserverMessage.Complete( EIMOperationDataAvailable ); - } - else - { - iObserverMessage.Complete( packet->OperationCode() ); - } + iObserverMessage.Complete( packet->OperationCode() ); iObserverActive = EFalse; } @@ -285,14 +278,7 @@ if( iPacketsArray.Count() ) { CIMCacheBufferArray* packet = iPacketsArray[ 0 ] ; - if( packet->OperationCode() == EIMOperationFetchAll ) - { - iObserverMessage.Complete( EIMOperationUnreadChange ); - } - else - { - iObserverMessage.Complete( packet->OperationCode() ); - } + iObserverMessage.Complete( packet->OperationCode() ); iObserverActive = EFalse; } break; @@ -574,7 +560,7 @@ { // write the message into continuous memory stream if( iAccessorInitialized || - iConvesationInitialized /*&& aMsgHeader->IsChatStarted()*/ ) + iConvesationInitialized && aMsgHeader->IsChatStarted() ) { ExternalizeSingleChatDataL(EIMOperationUnreadMessage, aMsgHeader, aMessage ); if( iObserverActive )