diff -r aba12c885d83 -r 96907930389d calendarui/views/src/calennativeview.cpp --- a/calendarui/views/src/calennativeview.cpp Thu Jul 15 18:37:27 2010 +0300 +++ b/calendarui/views/src/calennativeview.cpp Thu Aug 19 09:53:43 2010 +0300 @@ -708,11 +708,14 @@ notificationArray.Append(ECalenNotifyDeleteFailed); notificationArray.Append(ECalenNotifyEntryDeleted); notificationArray.Append(ECalenNotifyResourceChanged); + notificationArray.Append(ECalenNotifyEventViewLaunchedFromAlarm); iServices.RegisterForNotificationsL( this,notificationArray); notificationArray.Reset(); + iIgnoreTap = EFalse; + iCommandProcessing = EFalse; TCallBack callback(CCalenNativeView::AsyncCopyToCalendarsL,this); iAsyncCallback = new(ELeave) CAsyncCallBack(callback,CActive::EPriorityStandard); @@ -1076,6 +1079,11 @@ PIM_TRAPD_HANDLE( OnLocaleChangedL( EChangesSystemTime ) ); } break; + case ECalenNotifyEventViewLaunchedFromAlarm: + { + SetTapIgnore(ETrue); + } + break; case ECalenNotifyEntryClosed: { // The editor/ viewer is changed @@ -1311,6 +1319,8 @@ void CCalenNativeView::OnEditorClosedL() { TRACE_ENTRY_POINT; + + SetTapIgnore(EFalse); // If the view is active, then update status pane if( Container() ) { @@ -1351,6 +1361,17 @@ } // ---------------------------------------------------------------------------- +// CCalenNativeView::IsEventViewLaunchedFromAlarm +// other details are commented in the header +// ---------------------------------------------------------------------------- +// +TBool CCalenNativeView::IsEventViewLaunchedFromAlarm() + { + TRACE_ENTRY_POINT; + return iIgnoreTap; + TRACE_EXIT_POINT; + } +// ---------------------------------------------------------------------------- // CCalenNativeView::SetCommandHandlingProgress // other details are commented in the header // ---------------------------------------------------------------------------- @@ -1428,4 +1449,15 @@ } } +// ---------------------------------------------------------------------------- +// CCalenNativeView::SetTapIgnore +// Sets flag to ignore tap on any of the views +// (other items were commented in a header). +// ---------------------------------------------------------------------------- +// +void CCalenNativeView::SetTapIgnore(TBool aIgnore) + { + iIgnoreTap = aIgnore; + } + // End of File