--- a/calendarui/controller/src/calenviewmanager.cpp Tue Apr 27 16:36:22 2010 +0300
+++ b/calendarui/controller/src/calenviewmanager.cpp Tue May 11 16:12:24 2010 +0300
@@ -702,7 +702,7 @@
// check for iAvoidRepopulation to avoid repopulation whenever
// 1) Application comes to foreground
// 2) Applictaion is opened after fake exit
- if(!iAvoidRepopulation)
+ if(!iAvoidRepopulation || iController.IsLaunchFromExternalApp() )
{
TRAPD(error,StartActiveStepL());
if(error!=KErrNone)
@@ -1734,25 +1734,6 @@
CleanupStack::PopAndDestroy(repository);
}
}
- else // If default view is native view, then activate it
- {
- iAvoidRepopulation = EFalse;
- // In case of launching missed event view or missed alarms view, there
- // is no need to activate default view.
- if( ( iCurrentViewId.iViewUid.iUid != KCalenMissedEventViewUidValue ) &&
- ( iCurrentViewId.iViewUid.iUid != KCalenMissedAlarmsViewUidValue ) )
- {
- // Find the default view in the view cycle list
- TInt position = iViewInfoArray.Find(
- defaultViewUid, CCalenViewInfo::ViewInfoIdentifier );
- if( position != KErrNotFound )
- {
- TVwsViewId targetViewId( KUidCalendar, defaultViewUid);
- RequestActivationL(targetViewId);
- iViewCycleIndex = position;
- }
- }
- }
TRACE_EXIT_POINT;
}