diff -r 5456b4e8b3a8 -r 3321d3e205b6 idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp --- a/idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp Wed Sep 01 12:32:46 2010 +0100 +++ b/idlehomescreen/xmluirendering/uiengine/src/xnrootdata.cpp Tue Sep 14 20:58:58 2010 +0300 @@ -45,6 +45,7 @@ // Constants const TInt KScheduleInterval( 2000000 ); +_LIT8( KTemplateViewUID, "0x20026f50" ); // ============================ LOCAL FUNCTIONS ================================ @@ -94,6 +95,9 @@ // CXnRootData::~CXnRootData() { + delete iTemplateViewUid; + iTemplateViewUid = NULL; + if ( iLoadTimer ) { iLoadTimer->Cancel(); @@ -250,7 +254,7 @@ // // ----------------------------------------------------------------------------- // -void CXnRootData::LoadRemainingViews() +void CXnRootData::LoadRemainingViewsL() { if ( iFlags.IsClear( EIsDispose ) ) { @@ -434,10 +438,9 @@ { iPluginsData.Remove( index ); - if ( iViewsToDestroy.Find( aViewData ) == KErrNotFound ) + if ( iViewsToDestroy.Find( aViewData ) == KErrNotFound && + iViewsToDestroy.Append( aViewData ) == KErrNone ) { - iViewsToDestroy.Append( aViewData ); - iDestroyTimer->Cancel(); iDestroyTimer->Start( TTimeIntervalMicroSeconds32( 0 ), @@ -600,6 +603,28 @@ return iMaxPages; } +// --------------------------------------------------------------------------- +// Returns TemplateViewUid +// --------------------------------------------------------------------------- +// +const TDesC8& CXnRootData::TemplateViewUid() const + { + const TDesC8& templateViewUid = KTemplateViewUID; + return iTemplateViewUid ? *iTemplateViewUid : templateViewUid; // qhd uid + }; + +// --------------------------------------------------------------------------- +// Sets TemplateViewUid +// --------------------------------------------------------------------------- +// +void CXnRootData::SetTemplateViewUidL( const TDesC8& aTemplateViewUid ) + { + delete iTemplateViewUid; + iTemplateViewUid = NULL; + + iTemplateViewUid = aTemplateViewUid.AllocL(); + }; + // ----------------------------------------------------------------------------- // CXnRootData::RunDestroyL() //