diff -r 8bda91a87a00 -r 8ee96d21d9bf gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/src/ProEngWrapAPIBlocks.cpp --- a/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/src/ProEngWrapAPIBlocks.cpp Thu Aug 19 10:12:30 2010 +0300 +++ b/gsprofilesrv_pub/profiles_engine_wrapper_api/tsrc/BC/ProfilesEngineWrapperAPI/src/ProEngWrapAPIBlocks.cpp Tue Aug 31 15:29:50 2010 +0300 @@ -64,7 +64,7 @@ ENTRY( "ReqProfActNotificationsL", CProEngWrapAPI::RequestProfileActivationNotificationsL ), ENTRY( "CanProfActNotificationsL", CProEngWrapAPI::CancelProfileActivationNotificationsL ), ENTRY( "ReqActProfNotificationsL", CProEngWrapAPI::RequestActiveProfileNotificationsL ), - ENTRY( "CanActProfNotificationsL", CProEngWrapAPI::CancelActiveProfileNotificationsL ), + ENTRY( "CanActProfNotificationsL", CProEngWrapAPI::CancelProfileActivationNotificationsL ), ENTRY( "ReqProfNotificationsL", CProEngWrapAPI::RequestProfileNotificationsL ), ENTRY( "CanProfNotificationsL", CProEngWrapAPI::CancelProfileNotificationsL ), ENTRY( "ReqProfNameArrayNotL", CProEngWrapAPI::RequestProfileNameArrayNotificationsL ), @@ -222,22 +222,8 @@ CleanupStack::PushL( observer ); TRAP_IGNORE(nh->RequestProfileActivationNotificationsL ( *observer ) ); - - TInt previousid( engine->ActiveProfileId() ); - if ( previousid == EProfileMeetingId ) //example for active profile change - { - engine->SetActiveProfileL( EProfileOutdoorId ); - } - else - { - engine->SetActiveProfileL( EProfileMeetingId ); - } - TInt activeid( engine->ActiveProfileId() ); - if ( previousid!=activeid ) - { - iSchedulerUtility->Start(); - } - + engine->SetActiveProfileL( EProfileMeetingId ); + iSchedulerUtility->Start(); CleanupStack::PopAndDestroy( observer ); CleanupStack::PopAndDestroy( wrapper ); CleanupStack::PopAndDestroy(); // engine @@ -267,21 +253,8 @@ CleanupStack::PushL( observer ); TRAP_IGNORE(nh->RequestProfileActivationNotificationsL ( *observer ) ); - TInt previousid( engine->ActiveProfileId() ); - if ( previousid == EProfileMeetingId ) //example for active profile change - { - engine->SetActiveProfileL( EProfileOutdoorId ); - } - else - { - engine->SetActiveProfileL( EProfileMeetingId ); - } - TInt activeid( engine->ActiveProfileId() ); - if ( previousid!=activeid ) - { - iSchedulerUtility->Start(); - } - + engine->SetActiveProfileL( EProfileMeetingId ); + iSchedulerUtility->Start(); nh->CancelProfileActivationNotifications(); CleanupStack::PopAndDestroy( observer ); CleanupStack::PopAndDestroy( wrapper );