diff -r f62f87b200ec -r 8e5041d13c84 contentstorage/casrv/cawidgetscanner/src/cawidgetdescription.cpp --- a/contentstorage/casrv/cawidgetscanner/src/cawidgetdescription.cpp Fri Mar 19 09:35:23 2010 +0200 +++ b/contentstorage/casrv/cawidgetscanner/src/cawidgetdescription.cpp Fri Apr 16 15:16:09 2010 +0300 @@ -74,6 +74,9 @@ //library iLibrary.CreateL( KCaMaxAttrValueLen ); aEntry->FindAttribute( KAttrWidgetLibrary, iLibrary ); + //path + iPath.CreateL( KCaMaxAttrValueLen ); + aEntry->FindAttribute( KAttrWidgetPath, iPath ); //uri iUri.CreateL( KCaMaxAttrValueLen ); aEntry->FindAttribute( KAttrWidgetUri, iUri ); @@ -146,6 +149,7 @@ iUri.Close(); iIconUri.Close(); iLibrary.Close(); + iPath.Close(); iModificationTime.Close(); } @@ -335,7 +339,23 @@ { return iLibrary; } - +// ----------------------------------------------------------------------------- +// +// ----------------------------------------------------------------------------- +// +TPtrC CCaWidgetDescription::GetPath( ) const + { + return iPath; + } +// ----------------------------------------------------------------------------- +// +// ----------------------------------------------------------------------------- +// +void CCaWidgetDescription::SetPathL( const TDesC& aPath ) + { + iPath.Close(); + iPath.CreateL(aPath); + } // ----------------------------------------------------------------------------- // // ----------------------------------------------------------------------------- @@ -421,14 +441,12 @@ { entry->SetFlags( EVisible ); } - if ( iPackageUid ) { TBuf uidDesc; uidDesc.AppendNum( iPackageUid,EHex ); entry->AddAttributeL( KCaPackageUid, uidDesc ); } - if ( iEntryId != KNoId ) { entry->SetId( iEntryId ); @@ -449,7 +467,10 @@ entry->SetFlags( entry->GetFlags() & ~ERemovable ); } } - + if ( iPath != KNullDesC ) + { + entry->AddAttributeL(KAttrWidgetPath, iPath); + } if ( iTitle != KNullDesC ) { entry->SetTextL(iTitle); @@ -472,7 +493,8 @@ } if ( iIconUri != KNullDesC) { - entry->SetIconDataL(0, 0, 0, 0, iIconUri); + // aSkinId and AppId not used for widgets - KNullDesC + entry->SetIconDataL(iIconUri, KNullDesC, KNullDesC); } if( iModificationTime != KNullDesC )