--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/src/thumbnailmanagerimpl.cpp Wed Sep 15 12:32:44 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/src/thumbnailmanagerimpl.cpp Wed Oct 13 14:53:56 2010 +0300
@@ -172,21 +172,21 @@
if(aObjectSource.Id() > 0)
{
- getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(),
- aObjectSource.MimeType(),iFlags, iQualityPreference, iSize, iDisplayMode,
- priority, aClientData, aGeneratePersistentSizesOnly, KNullDesC, iThumbnailSize);
+ getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(), iFlags,
+ iQualityPreference, iSize, iDisplayMode, priority, aClientData, aGeneratePersistentSizesOnly,
+ KNullDesC, iThumbnailSize);
}
else if ( aObjectSource.Uri().Length())
{
- getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(),
- aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
- priority, aClientData, aGeneratePersistentSizesOnly, KNullDesC, iThumbnailSize );
+ getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(), iFlags,
+ iQualityPreference, iSize, iDisplayMode, priority, aClientData, aGeneratePersistentSizesOnly,
+ KNullDesC, iThumbnailSize );
}
else
{
- getThumbnailActive->GetThumbnailL( aObjectSource.FileHandle(), aObjectSource.Id(),
- aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
- priority, aClientData, aGeneratePersistentSizesOnly, KNullDesC, iThumbnailSize );
+ getThumbnailActive->GetThumbnailL( aObjectSource.FileHandle(), aObjectSource.Id(), iFlags,
+ iQualityPreference, iSize, iDisplayMode, priority, aClientData, aGeneratePersistentSizesOnly,
+ KNullDesC, iThumbnailSize );
}
iRequestQueue->AddRequestL( getThumbnailActive );
@@ -231,9 +231,9 @@
( iFs, iSession, iObserver, iRequestObserver, iRequestId, priority, iRequestQueue );
CleanupStack::PushL( getThumbnailActive );
- getThumbnailActive->GetThumbnailL( KNullDesC, aThumbnailId, KNullDesC8,
- iFlags, iQualityPreference, iSize, iDisplayMode, priority, aClientData,
- EFalse, KNullDesC, iThumbnailSize );
+ getThumbnailActive->GetThumbnailL( KNullDesC, aThumbnailId, iFlags,
+ iQualityPreference, iSize, iDisplayMode, priority, aClientData,
+ EFalse, KNullDesC, iThumbnailSize );
iRequestQueue->AddRequestL( getThumbnailActive );
CleanupStack::Pop( getThumbnailActive );
@@ -267,15 +267,15 @@
if ( aObjectSource.Uri().Length())
{
- getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(),
- aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
- priority, aClientData, EFalse, aTargetUri, iThumbnailSize );
+ getThumbnailActive->GetThumbnailL( aObjectSource.Uri(), aObjectSource.Id(), iFlags,
+ iQualityPreference, iSize, iDisplayMode, priority, aClientData,
+ EFalse, aTargetUri, iThumbnailSize );
}
else
{
getThumbnailActive->GetThumbnailL( aObjectSource.FileHandle(), aObjectSource.Id(),
- aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
- priority, aClientData, EFalse, aTargetUri, iThumbnailSize );
+ iFlags, iQualityPreference, iSize, iDisplayMode, priority, aClientData,
+ EFalse, aTargetUri, iThumbnailSize );
}
iRequestQueue->AddRequestL( getThumbnailActive );
@@ -307,20 +307,13 @@
CleanupStack::PushL( getThumbnailActive );
if (aObjectSource.Uri().Length() &&
- aObjectSource.TargetUri().Length())
- {
- // from path
- getThumbnailActive->SetThumbnailL( aObjectSource.Uri(),
- aObjectSource.MimeType(), iFlags, iQualityPreference, iSize, iDisplayMode,
- priority, aClientData, ETrue, aObjectSource.TargetUri(), iThumbnailSize, ETrue);
- }
- else if (aObjectSource.Uri().Length() &&
- aObjectSource.Bitmap() != NULL)
+ aObjectSource.Bitmap() != NULL)
{
// from bitmap
getThumbnailActive->SetThumbnailL( aObjectSource.GetBitmapOwnership(),
- aObjectSource.Id(), KBmpMime, iFlags, iQualityPreference, iSize, iDisplayMode,
- priority, aClientData, ETrue, aObjectSource.Uri(), iThumbnailSize, ETrue);
+ aObjectSource.Id(), KBmpMime, iFlags, iQualityPreference,
+ iSize, iDisplayMode, priority, aClientData, ETrue,
+ aObjectSource.Uri(), iThumbnailSize, ETrue);
}
else if (aObjectSource.Uri().Length() &&
aObjectSource.Buffer() != NULL &&
@@ -374,9 +367,9 @@
else if( !aObjectSource.Buffer() )
{
getThumbnailActive->GetThumbnailL( aObjectSource.Id(),
- aObjectSource.Uri(), aObjectSource.MimeType(), iFlags,
- iQualityPreference, iSize, iDisplayMode, priority, NULL,
- ETrue, aObjectSource.Uri(), EUnknownThumbnailSize);
+ aObjectSource.Uri(), iFlags, iQualityPreference, iSize,
+ iDisplayMode, priority, NULL, ETrue, aObjectSource.Uri(),
+ EUnknownThumbnailSize);
}
else
{