diff -r a5a39a295112 -r 8baec10861af contentcontrolsrv/ccsrv/src/ccsrvsession.cpp --- a/contentcontrolsrv/ccsrv/src/ccsrvsession.cpp Wed Sep 01 12:22:09 2010 +0100 +++ b/contentcontrolsrv/ccsrv/src/ccsrvsession.cpp Tue Sep 14 21:55:16 2010 +0300 @@ -440,18 +440,18 @@ CCcSrvMsg* message = CCcSrvMsg::NewL(); CleanupStack::PushL( message ); message->InternalizeL( stream ); - message->SetMessage( aMessage ); + message->SetFunction( aMessage.Function() ); message->SetSender( iId ); + aMessage.Complete( KErrNone ); + // Forward notification to observers for ( TInt i = 0; i < iObservers.Count(); i++ ) { message->SetReceiver( iObservers[ i ] ); Server().SendMsgL( *message ); } - - message->Message().Complete( KErrNone ); - + CleanupStack::PopAndDestroy( message ); CleanupStack::PopAndDestroy( msgBuf ); }