photosgallery/collectionframework/datasource/plugins/glxdatasourcemde2.5/src/glxdatasourcetaskmdsidlist.cpp
--- a/photosgallery/collectionframework/datasource/plugins/glxdatasourcemde2.5/src/glxdatasourcetaskmdsidlist.cpp Wed Jun 09 09:41:51 2010 +0300
+++ b/photosgallery/collectionframework/datasource/plugins/glxdatasourcemde2.5/src/glxdatasourcetaskmdsidlist.cpp Mon Jun 21 15:40:32 2010 +0300
@@ -243,6 +243,9 @@
if( aFilterProperties.iPromoteSystemItems )
{
RArray<TGlxMediaId> list = aFilteredList;
+ // Here we don't have to push list in cleanup stack as caller function,
+ // CGlxDataSourceTaskMdeIdList::DoHandleListQueryCompletedL is already
+ // doing that.
TInt cameraAlbumIndex = list.Find(DataSource()->CameraAlbumId());
// If Camera Index is not KErrNotFound, 1st Album should be Captured and
@@ -251,13 +254,13 @@
if( KErrNotFound != cameraAlbumIndex )
{
list.Remove(cameraAlbumIndex);
- list.Insert(DataSource()->CameraAlbumId(), KGlxCameraAlbumPromotionPosition);
+ list.InsertL(DataSource()->CameraAlbumId(), KGlxCameraAlbumPromotionPosition);
TInt favoritesIndex = list.Find(DataSource()->FavoritesId());
if( KErrNotFound != favoritesIndex )
{
list.Remove(favoritesIndex);
- list.Insert(DataSource()->FavoritesId(),KGlxfavoritesAlbumPromotionPosition);
+ list.InsertL(DataSource()->FavoritesId(),KGlxfavoritesAlbumPromotionPosition);
}
}
else
@@ -269,7 +272,7 @@
if( KErrNotFound != favoritesIndex )
{
list.Remove(favoritesIndex);
- list.Insert(DataSource()->FavoritesId(),KGlxfavoritesAlbumPromotionPosition - 1);
+ list.InsertL(DataSource()->FavoritesId(),KGlxfavoritesAlbumPromotionPosition - 1);
}
}