equal
deleted
inserted
replaced
47 iSatIcon.Close(); |
47 iSatIcon.Close(); |
48 iSatSession.Close(); |
48 iSatSession.Close(); |
49 } |
49 } |
50 |
50 |
51 // ----------------------------------------------------------------------------- |
51 // ----------------------------------------------------------------------------- |
52 // Destructor |
52 // LoadIconL |
53 // ----------------------------------------------------------------------------- |
53 // ----------------------------------------------------------------------------- |
54 EXPORT_C CAknIcon* CCaSatHandler::LoadIconL() |
54 EXPORT_C CAknIcon* CCaSatHandler::LoadIconL() |
55 { |
55 { |
56 TInt iconId( KErrNone ); |
56 TInt iconId( KErrNone ); |
57 User::LeaveIfError( RProperty::Get( KCRUidCa, KCaSatUIIconId, iconId ) ); |
57 User::LeaveIfError( RProperty::Get( KCRUidCa, KCaSatUIIconId, iconId ) ); |
61 { |
61 { |
62 RIconEf iIconEf; |
62 RIconEf iIconEf; |
63 iSatIcon.GetIconInfoL( TUint8( iconId ), iIconEf ); |
63 iSatIcon.GetIconInfoL( TUint8( iconId ), iIconEf ); |
64 CleanupClosePushL( iIconEf ); |
64 CleanupClosePushL( iIconEf ); |
65 CFbsBitmap* bitmap = GetBitmapL( iIconEf ); |
65 CFbsBitmap* bitmap = GetBitmapL( iIconEf ); |
66 if( !bitmap ) |
66 if( bitmap ) |
67 { |
67 { |
68 CFbsBitmap* mask( NULL ); |
68 CFbsBitmap* mask( new (ELeave) CFbsBitmap ); |
69 CleanupStack::PushL( mask ); |
69 CleanupStack::PushL( mask ); |
70 |
70 |
71 icon->SetBitmap( bitmap ); |
71 icon->SetBitmap( bitmap ); |
72 // create and set mask |
72 // create and set mask |
73 User::LeaveIfError( mask->Create( bitmap->SizeInPixels(), |
73 User::LeaveIfError( mask->Create( bitmap->SizeInPixels(), |