diff -r ce1c7ad1f18b -r bcb43dc84c44 photosgallery/collectionframework/plugins/glxcollectionpluginmonths/src/glxcollectionpluginmonths.cpp --- a/photosgallery/collectionframework/plugins/glxcollectionpluginmonths/src/glxcollectionpluginmonths.cpp Mon Mar 15 12:40:30 2010 +0200 +++ b/photosgallery/collectionframework/plugins/glxcollectionpluginmonths/src/glxcollectionpluginmonths.cpp Wed Mar 31 21:31:03 2010 +0300 @@ -121,6 +121,7 @@ TInt attrCount = aAttributeArray.Count(); TBool found = EFalse; TBool startfound = EFalse; + TBool endfound = EFalse; #ifdef GLX_SUB_TITLE_REL8 @@ -180,6 +181,10 @@ { startfound = ETrue; } + else if(aAttributeArray[index] == KGlxMediaCollectionInternalEndDate ) + { + endfound = ETrue; + } } if (!found) @@ -190,6 +195,10 @@ { aAttributeArray.Append(KGlxMediaCollectionInternalStartDate); } + if(!endfound) + { + aAttributeArray.Append(KGlxMediaCollectionInternalEndDate); + } #endif // end date will be returned when start date is requested. } @@ -231,6 +240,7 @@ CleanupStack::PushL(mediaArray); const TInt arrayCount = mediaArray->Count(); + GLX_DEBUG2("CGlxCollectionPluginMonths::HandleCpiAttributeResponseL arrayCount=%d", arrayCount); // Sanity check if (arrayCount != mediaIdCount) @@ -262,6 +272,8 @@ TRACER("CGlxCollectionPluginMonths::HandleCpiAttributeResponseL"); TInt count = aCpiAttributes.Count(); + GLX_DEBUG2("CGlxCollectionPluginMonths::HandleCpiAttributeResponseL count=%d", count); + TLanguage lang; lang = User::Language(); @@ -666,8 +678,10 @@ return filterProperties; } - - +// ---------------------------------------------------------------------------- +// GetMonthNameAsStringLC +// ---------------------------------------------------------------------------- +// HBufC* CGlxCollectionPluginMonths::GetMonthNameAsStringLC( const TMonth& aMonth, const TMonthStringType& aStrType) {