diff -r 15e4dd19031c -r a0713522ab97 idlefw/plugins/sapidataplugin/src/sapidata.cpp --- a/idlefw/plugins/sapidataplugin/src/sapidata.cpp Wed Mar 31 22:04:35 2010 +0300 +++ b/idlefw/plugins/sapidataplugin/src/sapidata.cpp Wed Apr 14 16:16:44 2010 +0300 @@ -122,18 +122,17 @@ if(iPubObserver) { - TRAP_IGNORE(iPubObserver->ReleaseL() ); delete iPubObserver; iPubObserver = NULL; } if(iContentObserver) { - TRAP_IGNORE(iContentObserver->ReleaseL() ); delete iContentObserver; iContentObserver = NULL; } if( iInterface ) { + // This will also release all the registered observers iInterface->Close(); iInterface = NULL; } @@ -674,7 +673,7 @@ if ( iItemCount > 0) { CLiwDefaultMap* pubRegFilter = CreateFilterLC( KAll(), KAll() ); - pubRegFilter->InsertL( KOperation, TLiwVariant( KUpdate ) ); + pubRegFilter->InsertL( KOperation, TLiwVariant( KAddUpdate ) ); iPubObserver->RegisterL( pubRegFilter, KPubData() ); CleanupStack::PopAndDestroy( pubRegFilter ); } @@ -757,8 +756,6 @@ CLiwGenericParamList* inParamList = &iServiceHandler->InParamListL(); CLiwGenericParamList* outParamList = &iServiceHandler->OutParamListL(); - TLiwGenericParam pluginId( KPluginId, TLiwVariant( iContentId ) ); - inParamList->AppendL( pluginId ); TLiwGenericParam type( KType, TLiwVariant( KPubData ) ); inParamList->AppendL( type );