diff -r 96907930389d -r 12af337248b1 alarmui/src/alarmcontextfwsupport.cpp --- a/alarmui/src/alarmcontextfwsupport.cpp Thu Aug 19 09:53:43 2010 +0300 +++ b/alarmui/src/alarmcontextfwsupport.cpp Tue Aug 31 15:13:43 2010 +0300 @@ -32,7 +32,6 @@ // USER INCLUDE #include "alarmcontextfwsupport.h" #include "AlmAlarmControl.h" -#include "alarmutils.h" #include "pim_trace.h" @@ -88,11 +87,9 @@ { // snooze alarm if(iAlarmControl->CanSnooze()) - iAlarmControl->ExternalSnoozeAlarm(); - } - else if( contextObject.Value() == TPtrC( KAlarmUISourceCommandValues[ECommandAlarmSilence] ) ) - { - SilenceAlarm(); + { + iAlarmControl->ExternalSnoozeAlarm(); + } } else { @@ -117,13 +114,9 @@ if( aActionToExecute.Identifier() == TPtrC( KAlarmUIActions[EActionSnooze] ) ) { // snooze the alarm - if(iAlarmControl->CanSnooze()) - iAlarmControl->ExternalSnoozeAlarm(); + if(iAlarmControl->CanSnooze()) + iAlarmControl->ExternalSnoozeAlarm(); } - else if( aActionToExecute.Identifier() == TPtrC( KAlarmUIActions[EActionSilence] ) ) - { - SilenceAlarm(); - } else if( aActionToExecute.Identifier() == TPtrC( KAlarmUIActions[EActionStop] ) ) { //Do not stop the alarm internally but force the user to stop the alarm manually. @@ -190,7 +183,6 @@ // define actions(s) DefineActionL( EActionSnooze ); - DefineActionL( EActionSilence ); //Stop action definition should not be defined as the alarm component should not automatically stop the alarm on observing context events // but continue to expire the alarm and force the user to manually stop the alarm @@ -307,7 +299,6 @@ // subscribe for action(s) SubscribeActionL( EActionSnooze ); - SubscribeActionL( EActionSilence ); //Subscription to stop action definition from the context events should not be defined as the alarm component should not automatically stop the alarm on observing context events // but continue to expire the alarm and force the user to manually stop the alarm @@ -460,11 +451,5 @@ TRACE_EXIT_POINT; } -void CAlarmContextFwSupport::SilenceAlarm() - { - if( iAlarmControl->AlarmUtils() ) - { - iAlarmControl->AlarmUtils()->DoSilence(); - } - } + // End of File