equal
deleted
inserted
replaced
99 CCalenViewManager::~CCalenViewManager() |
99 CCalenViewManager::~CCalenViewManager() |
100 { |
100 { |
101 TRACE_ENTRY_POINT; |
101 TRACE_ENTRY_POINT; |
102 |
102 |
103 delete iPopulator; |
103 delete iPopulator; |
104 delete iToolbar; |
104 if(iToolbar) |
105 |
105 { |
|
106 delete iToolbar; |
|
107 iToolbar = NULL; |
|
108 } |
106 if( iSetting ) |
109 if( iSetting ) |
107 { |
110 { |
108 iSetting->Release(); |
111 iSetting->Release(); |
109 } |
112 } |
110 |
113 |
623 // set today's date to the context |
626 // set today's date to the context |
624 context.SetFocusDateAndTimeL( todayCalTime, iCurrentViewId ); |
627 context.SetFocusDateAndTimeL( todayCalTime, iCurrentViewId ); |
625 |
628 |
626 SetRepopulation(EFalse); |
629 SetRepopulation(EFalse); |
627 // reactivate the current view |
630 // reactivate the current view |
628 RequestActivationL(iCurrentViewId.iViewUid); |
631 //RequestActivationL(iCurrentViewId.iViewUid); |
|
632 RequestActivationL(KUidCalenDayView); |
629 |
633 |
630 // dim "today" toolbar item since focus is on today |
634 // dim "today" toolbar item since focus is on today |
631 iToolbar->Toolbar().SetItemDimmed( ECalenGotoToday, ETrue, ETrue); |
635 iToolbar->Toolbar().SetItemDimmed( ECalenGotoToday, ETrue, ETrue); |
632 } |
636 } |
633 break; |
637 break; |
1142 // whenever application is brought to foreground |
1146 // whenever application is brought to foreground |
1143 iAvoidRepopulation = ETrue; |
1147 iAvoidRepopulation = ETrue; |
1144 |
1148 |
1145 if( iController.IsFasterAppFlagEnabled() ) |
1149 if( iController.IsFasterAppFlagEnabled() ) |
1146 { |
1150 { |
1147 iController.RemoveDeadCalendarsL(); |
1151 TRAP_IGNORE(iController.RemoveDeadCalendarsL()); |
1148 } |
1152 } |
1149 } |
1153 } |
1150 break; |
1154 break; |
1151 case ECalenNotifyViewPopulationComplete: |
1155 case ECalenNotifyViewPopulationComplete: |
1152 { |
1156 { |