equal
deleted
inserted
replaced
493 { |
493 { |
494 User::Leave( ret ); |
494 User::Leave( ret ); |
495 } |
495 } |
496 |
496 |
497 Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); |
497 Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); |
498 TRAPD(err, iScrSession.GetComponentL(compId, *entry)); |
498 TRAPD(err, retVal = iScrSession.GetComponentL(compId, *entry)); |
499 |
499 |
500 if ( err == KErrNotFound ) |
500 if ( err == KErrNotFound || !retVal ) |
501 { |
501 { |
502 retVal = EFalse; |
502 retVal = EFalse; |
503 } |
503 } |
504 else if (err != KErrNone ) |
504 else if (err != KErrNone ) |
505 { |
505 { |
1960 CleanupStack::PushL( tempInfo ); |
1960 CleanupStack::PushL( tempInfo ); |
1961 |
1961 |
1962 // Get widget |
1962 // Get widget |
1963 Usif::TComponentId compId = widgetComponentIdList[i]; |
1963 Usif::TComponentId compId = widgetComponentIdList[i]; |
1964 Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); |
1964 Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); |
1965 iScrSession.GetComponentL(compId, *entry); |
1965 TBool retVal = iScrSession.GetComponentL(compId, *entry); |
1966 |
1966 |
1967 // Fill id & version |
1967 if ( retVal ) |
1968 tempInfo->iUid.iUid= compId; |
1968 { |
1969 *(tempInfo->iVersion) = entry->Version(); |
1969 // Fill id & version |
1970 |
1970 tempInfo->iUid.iUid= compId; |
1971 // Append to arrayt |
1971 *(tempInfo->iVersion) = entry->Version(); |
1972 aWidgets.AppendL( tempInfo ); |
1972 |
|
1973 // Append to arrayt |
|
1974 aWidgets.AppendL( tempInfo ); |
|
1975 } |
1973 |
1976 |
1974 CleanupStack::PopAndDestroy(entry); |
1977 CleanupStack::PopAndDestroy(entry); |
1975 CleanupStack::Pop( tempInfo ); |
1978 CleanupStack::Pop( tempInfo ); |
1976 } |
1979 } |
1977 |
1980 |
2113 TBool retVal = EFalse; |
2116 TBool retVal = EFalse; |
2114 |
2117 |
2115 // Get entry |
2118 // Get entry |
2116 Usif::TComponentId compId = aUid.iUid; |
2119 Usif::TComponentId compId = aUid.iUid; |
2117 Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); |
2120 Usif::CComponentEntry* entry = Usif::CComponentEntry::NewLC(); |
2118 TRAPD(err, iScrSession.GetComponentL(compId, *entry)); |
2121 TRAPD(err, retVal = iScrSession.GetComponentL(compId, *entry)); |
2119 |
2122 |
2120 if ( err == KErrNotFound || !retVal ) |
2123 if ( err == KErrNotFound || !retVal ) |
2121 { |
2124 { |
2122 retVal = EFalse; |
2125 retVal = EFalse; |
2123 } |
2126 } |