equal
deleted
inserted
replaced
889 { |
889 { |
890 iAppUi.ActivateLocalViewL( aViewUid, aMessageId, aMessage ); |
890 iAppUi.ActivateLocalViewL( aViewUid, aMessageId, aMessage ); |
891 } |
891 } |
892 |
892 |
893 // set the previous view id |
893 // set the previous view id |
894 iPreviousViewId.iViewUid = cachePreviousViewId; |
894 if(cachePreviousViewId != KUidCalenEventView) |
895 |
895 { |
|
896 iPreviousViewId.iViewUid = cachePreviousViewId; |
|
897 } |
896 TRACE_EXIT_POINT; |
898 TRACE_EXIT_POINT; |
897 } |
899 } |
898 |
900 |
899 // ---------------------------------------------------------------------------- |
901 // ---------------------------------------------------------------------------- |
900 // CCalenViewManager::StartActiveStepL |
902 // CCalenViewManager::StartActiveStepL |
1512 { |
1514 { |
1513 // Activate the previous view when an event is deleted from |
1515 // Activate the previous view when an event is deleted from |
1514 // the event view |
1516 // the event view |
1515 if(iPreviousViewId.iViewUid != KNullUid) |
1517 if(iPreviousViewId.iViewUid != KNullUid) |
1516 { |
1518 { |
1517 RequestActivationL(iPreviousViewId.iViewUid); |
1519 if(iPreviousToDayView.iViewUid != KNullUid) |
|
1520 { |
|
1521 RequestActivationL(iPreviousViewId.iViewUid, KUidCalenShowBackCba); |
|
1522 } |
|
1523 else |
|
1524 { |
|
1525 RequestActivationL(iPreviousViewId.iViewUid); |
|
1526 } |
1518 } |
1527 } |
1519 } |
1528 } |
1520 else |
1529 else |
1521 { |
1530 { |
1522 // refresh the current view |
1531 // refresh the current view |