equal
deleted
inserted
replaced
208 CleanupStack::Pop( buffer ); |
208 CleanupStack::Pop( buffer ); |
209 } |
209 } |
210 else |
210 else |
211 { |
211 { |
212 CleanupStack::PopAndDestroy( buffer ); |
212 CleanupStack::PopAndDestroy( buffer ); |
213 buffer = NULL; |
|
214 buffer = KNullDesC().AllocL(); |
213 buffer = KNullDesC().AllocL(); |
215 } |
214 } |
216 |
215 |
217 OstTraceFunctionExit0( RCMMANAGER_GETBEARERINFOSTRINGL_EXIT ); |
216 OstTraceFunctionExit0( RCMMANAGER_GETBEARERINFOSTRINGL_EXIT ); |
218 return buffer; |
217 return buffer; |
242 CleanupStack::Pop( buffer8 ); |
241 CleanupStack::Pop( buffer8 ); |
243 } |
242 } |
244 else |
243 else |
245 { |
244 { |
246 CleanupStack::PopAndDestroy( buffer8 ); |
245 CleanupStack::PopAndDestroy( buffer8 ); |
247 buffer8 = NULL; |
|
248 buffer8 = KNullDesC8().AllocL(); |
246 buffer8 = KNullDesC8().AllocL(); |
249 } |
247 } |
250 |
248 |
251 OstTraceFunctionExit0( RCMMANAGER_GETBEARERINFOSTRING8L_EXIT ); |
249 OstTraceFunctionExit0( RCMMANAGER_GETBEARERINFOSTRING8L_EXIT ); |
252 return buffer8; |
250 return buffer8; |
322 CleanupStack::Pop( buffer ); |
320 CleanupStack::Pop( buffer ); |
323 } |
321 } |
324 else |
322 else |
325 { |
323 { |
326 CleanupStack::PopAndDestroy( buffer ); |
324 CleanupStack::PopAndDestroy( buffer ); |
327 buffer = NULL; |
|
328 buffer = KNullDesC().AllocL(); |
325 buffer = KNullDesC().AllocL(); |
329 } |
326 } |
330 |
327 |
331 OstTraceFunctionExit0( RCMMANAGER_GETCONNECTIONMETHODINFOSTRINGL_EXIT ); |
328 OstTraceFunctionExit0( RCMMANAGER_GETCONNECTIONMETHODINFOSTRINGL_EXIT ); |
332 return buffer; |
329 return buffer; |
356 CleanupStack::Pop( buffer8 ); |
353 CleanupStack::Pop( buffer8 ); |
357 } |
354 } |
358 else |
355 else |
359 { |
356 { |
360 CleanupStack::PopAndDestroy( buffer8 ); |
357 CleanupStack::PopAndDestroy( buffer8 ); |
361 buffer8 = NULL; |
|
362 buffer8 = KNullDesC8().AllocL(); |
358 buffer8 = KNullDesC8().AllocL(); |
363 } |
359 } |
364 |
360 |
365 OstTraceFunctionExit0( RCMMANAGER_GETCONNECTIONMETHODINFOSTRING8L_EXIT ); |
361 OstTraceFunctionExit0( RCMMANAGER_GETCONNECTIONMETHODINFOSTRING8L_EXIT ); |
366 return buffer8; |
362 return buffer8; |
907 // |
903 // |
908 EXPORT_C HBufC* RCmManager::GetUncategorizedIconL() const |
904 EXPORT_C HBufC* RCmManager::GetUncategorizedIconL() const |
909 { |
905 { |
910 OstTraceFunctionEntry0( RCMMANAGER_GETUNCATEGORIZEDICONL_ENTRY ); |
906 OstTraceFunctionEntry0( RCMMANAGER_GETUNCATEGORIZEDICONL_ENTRY ); |
911 |
907 |
912 User::Leave( KErrNotSupported ); |
908 if ( !iCmManagerApi ) |
|
909 { |
|
910 User::Leave( KErrBadHandle ); |
|
911 } |
|
912 |
|
913 HBufC* buffer = HBufC::NewLC( KCmmStringLengthMax ); |
|
914 TInt err = iCmManagerApi->GetUncategorizedIcon( buffer ); |
|
915 User::LeaveIfError( err ); |
|
916 |
|
917 if ( buffer->Length() > 0 ) |
|
918 { |
|
919 CleanupStack::Pop( buffer ); |
|
920 } |
|
921 else |
|
922 { |
|
923 CleanupStack::PopAndDestroy( buffer ); |
|
924 buffer = KNullDesC().AllocL(); |
|
925 } |
913 |
926 |
914 OstTraceFunctionExit0( RCMMANAGER_GETUNCATEGORIZEDICONL_EXIT ); |
927 OstTraceFunctionExit0( RCMMANAGER_GETUNCATEGORIZEDICONL_EXIT ); |
915 return NULL; |
928 return buffer; |
916 } |
929 } |
917 |
930 |
918 // End of file |
931 // End of file |