diff -r b8fae6b8a148 -r d05a55b217df idlehomescreen/widgetmanager/src/wmwidgetdata.cpp --- a/idlehomescreen/widgetmanager/src/wmwidgetdata.cpp Wed Mar 31 21:17:19 2010 +0300 +++ b/idlehomescreen/widgetmanager/src/wmwidgetdata.cpp Wed Apr 14 15:47:59 2010 +0300 @@ -420,6 +420,17 @@ // CWmWidgetData::Description // --------------------------------------------------------- // +const TDesC& CWmWidgetData::Name() const + { + return ( iAsyncUninstalling ? + iWmResourceLoader.Uninstalling() : + iHsContentInfo->Name() ); + } + +// --------------------------------------------------------- +// CWmWidgetData::Description +// --------------------------------------------------------- +// const TDesC& CWmWidgetData::Description() const { if ( iHsContentInfo->Description().Length() <= 0 && @@ -447,7 +458,7 @@ { iWait->AsyncStop(); } - + iFireLogoChanged = ETrue; iLogoSize = aSize; HandleIconString( HsContentInfo().IconPath() ); @@ -517,14 +528,6 @@ { DestroyAnimData(); PrepairAnimL(); - - // set copy of widget name for uninstallation error case. - if ( iHsContentInfo->Name().Compare( iWmResourceLoader.Uninstalling() ) != - KErrNone ) - { - iWidgetName = iHsContentInfo->Name().AllocL(); - iHsContentInfo->SetNameL( iWmResourceLoader.Uninstalling() ); - } iAsyncUninstalling = ETrue; iAnimationIndex = 0; @@ -690,18 +693,10 @@ // CWmWidgetData::StopUninstallAnimation // --------------------------------------------------------- // -void CWmWidgetData::StopUninstallAnimationL() +void CWmWidgetData::StopUninstallAnimation() { iAsyncUninstalling = EFalse; DestroyAnimData(); - // restore widget name - if ( iWidgetName ) - { - iHsContentInfo->SetNameL( iWidgetName->Des() ); - delete iWidgetName; - iWidgetName = NULL; - } - FireDataChanged(); //redraw }