diff -r d05a55b217df -r 79311d856354 idlehomescreen/widgetmanager/src/wmconfiguration.cpp --- a/idlehomescreen/widgetmanager/src/wmconfiguration.cpp Wed Apr 14 15:47:59 2010 +0300 +++ b/idlehomescreen/widgetmanager/src/wmconfiguration.cpp Tue Apr 27 16:26:12 2010 +0300 @@ -282,19 +282,19 @@ { iOperatorAppType = ES60; iOperatorAppIdUid = StringToUid( appId ); - SetOperatorIcon( iOperatorAppIdUid ); + SetOperatorIconL( iOperatorAppIdUid ); } else if ( !type.Compare( KOpAppTypeCwrt ) ) { iOperatorAppType = ECwrt; iOperatorAppIdUid = FetchWidgetUidFromRegistryL( appId ); - SetOperatorIcon( iOperatorAppIdUid ); + SetOperatorIconL( iOperatorAppIdUid ); } else if ( !type.Compare( KOpAppTypeWrt ) ) { iOperatorAppType = EWrt; iOperatorAppIdUid = FetchWidgetUidFromRegistryL( appId ); - SetOperatorIcon( iOperatorAppIdUid ); + SetOperatorIconL( iOperatorAppIdUid ); } else if ( !type.Compare( KOpAppTypeJava ) ) { @@ -307,7 +307,7 @@ { iOperatorAppType = EQt; iOperatorAppIdUid = StringToUid( appId ); - SetOperatorIcon( iOperatorAppIdUid ); + SetOperatorIconL( iOperatorAppIdUid ); } } CleanupStack::PopAndDestroy( applicationInfo ); @@ -318,15 +318,15 @@ // CWmConfiguration::SetOperatorIcon // --------------------------------------------------------- // -void CWmConfiguration::SetOperatorIcon( TUid aUid ) +void CWmConfiguration::SetOperatorIconL( TUid aUid ) { if ( iOperatorButtonIcon && !iOperatorButtonIcon->Des().Length() ) { delete iOperatorButtonIcon; iOperatorButtonIcon = NULL; - TRAP_IGNORE( iOperatorButtonIcon = HBufC::NewL( - KMaxUidName + KOperatorIcon().Length() ) ); + iOperatorButtonIcon = HBufC::NewL( + KMaxUidName + KOperatorIcon().Length() ); iOperatorButtonIcon->Des().Format( KOperatorIcon(), aUid ); }