equal
deleted
inserted
replaced
423 |
423 |
424 iServices.IssueCommandL( aCommand ); |
424 iServices.IssueCommandL( aCommand ); |
425 } |
425 } |
426 break; |
426 break; |
427 case ECalenShowCalendars: |
427 case ECalenShowCalendars: |
428 ClearMarkedToDoItems(); |
428 SaveCurrentItemIndexL(); |
|
429 Container()->MarkAllL( EFalse ); |
|
430 CCalenNativeView::HandleCommandL( aCommand ); |
|
431 break; |
429 default: |
432 default: |
430 SaveCurrentItemIndexL(); |
433 SaveCurrentItemIndexL(); |
431 CCalenNativeView::HandleCommandL( aCommand ); |
434 CCalenNativeView::HandleCommandL( aCommand ); |
432 break; |
435 break; |
433 } |
436 } |
928 RArray<TInt> colIdArray; |
931 RArray<TInt> colIdArray; |
929 CCalenNativeView::GetActiveCollectionidsL( iServices, colIdArray ); |
932 CCalenNativeView::GetActiveCollectionidsL( iServices, colIdArray ); |
930 |
933 |
931 if(colIdArray.Count() > 0) |
934 if(colIdArray.Count() > 0) |
932 { |
935 { |
|
936 colIdArray.Close(); |
933 if( !iServices.InstanceViewL(colIdArray) ) |
937 if( !iServices.InstanceViewL(colIdArray) ) |
934 { |
938 { |
935 TRACE_EXIT_POINT; |
939 TRACE_EXIT_POINT; |
936 return CCalenView::EWaitForInstanceView; |
940 return CCalenView::EWaitForInstanceView; |
937 } |
941 } |
941 return CCalenView::EKeepGoing; |
945 return CCalenView::EKeepGoing; |
942 } |
946 } |
943 } |
947 } |
944 else |
948 else |
945 { |
949 { |
|
950 colIdArray.Close(); |
946 if( !iServices.InstanceViewL() ) |
951 if( !iServices.InstanceViewL() ) |
947 { |
952 { |
948 TRACE_EXIT_POINT; |
953 TRACE_EXIT_POINT; |
949 return CCalenView::EWaitForInstanceView; |
954 return CCalenView::EWaitForInstanceView; |
950 } |
955 } |
952 { |
957 { |
953 TRACE_EXIT_POINT; |
958 TRACE_EXIT_POINT; |
954 return CCalenView::EKeepGoing; |
959 return CCalenView::EKeepGoing; |
955 } |
960 } |
956 } |
961 } |
957 colIdArray.Reset(); |
|
958 } |
962 } |
959 // else fall through... |
963 // else fall through... |
960 case ERequestedInstanceView: |
964 case ERequestedInstanceView: |
961 { |
965 { |
962 MCalenContext& context = iServices.Context(); |
966 MCalenContext& context = iServices.Context(); |