diff -r 7ec726f93df1 -r 489cf6208544 cmmanager/cmmgr/cmmapi/src/cmmanager.cpp --- a/cmmanager/cmmgr/cmmapi/src/cmmanager.cpp Fri May 14 16:15:46 2010 +0300 +++ b/cmmanager/cmmgr/cmmapi/src/cmmanager.cpp Thu May 27 13:17:01 2010 +0300 @@ -210,7 +210,6 @@ else { CleanupStack::PopAndDestroy( buffer ); - buffer = NULL; buffer = KNullDesC().AllocL(); } @@ -244,7 +243,6 @@ else { CleanupStack::PopAndDestroy( buffer8 ); - buffer8 = NULL; buffer8 = KNullDesC8().AllocL(); } @@ -324,7 +322,6 @@ else { CleanupStack::PopAndDestroy( buffer ); - buffer = NULL; buffer = KNullDesC().AllocL(); } @@ -358,7 +355,6 @@ else { CleanupStack::PopAndDestroy( buffer8 ); - buffer8 = NULL; buffer8 = KNullDesC8().AllocL(); } @@ -909,10 +905,27 @@ { OstTraceFunctionEntry0( RCMMANAGER_GETUNCATEGORIZEDICONL_ENTRY ); - User::Leave( KErrNotSupported ); + if ( !iCmManagerApi ) + { + User::Leave( KErrBadHandle ); + } + + HBufC* buffer = HBufC::NewLC( KCmmStringLengthMax ); + TInt err = iCmManagerApi->GetUncategorizedIcon( buffer ); + User::LeaveIfError( err ); + + if ( buffer->Length() > 0 ) + { + CleanupStack::Pop( buffer ); + } + else + { + CleanupStack::PopAndDestroy( buffer ); + buffer = KNullDesC().AllocL(); + } OstTraceFunctionExit0( RCMMANAGER_GETUNCATEGORIZEDICONL_EXIT ); - return NULL; + return buffer; } // End of file