diff -r debf68073f2f -r 142dacf7b30e mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp
--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp	Wed Sep 15 13:07:27 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp	Wed Oct 13 15:29:02 2010 +0300
@@ -68,9 +68,7 @@
 CMTPImageDpObjectPropertyMgr::CMTPImagePropertiesCache* CMTPImageDpObjectPropertyMgr::CMTPImagePropertiesCache::NewL()
     {
     CMTPImagePropertiesCache* self = new(ELeave) CMTPImagePropertiesCache(KElements, ENumProperties);
-    CleanupStack::PushL(self);
     self->ConstructL();
-    CleanupStack::Pop(self);
     return self;
     }
 
@@ -277,24 +275,6 @@
     case EMTPObjectPropCodeProtectionStatus://this property does not supported by image dp
         //nothing to do
         break;
-    case EMTPObjectPropCodeHidden:
-        {
-		__ASSERT_ALWAYS(( EMTPHidden == aValue )||( EMTPVisible == aValue ), User::Leave(KErrArgument));
-        TEntry entry;
-		User::LeaveIfError(iFramework.Fs().Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry));
-        if (( EMTPHidden == aValue ) && ( !entry.IsHidden()))
-            {
-            entry.iAtt &= ~KEntryAttHidden;
-            entry.iAtt |= KEntryAttHidden;
-            User::LeaveIfError(iFramework.Fs().SetAtt(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt));
-            }
-        else if (( EMTPVisible == aValue )&&( entry.IsHidden()))
-            {
-            entry.iAtt &= ~KEntryAttHidden;
-            User::LeaveIfError(iFramework.Fs().SetAtt(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt));
-            }
-        } 
-        break;
     default:
         //nothing to do
         break;
@@ -438,20 +418,7 @@
             aValue = EMTPProtectionNoProtection;
             }        
         }    
-        break;
-    case EMTPObjectPropCodeHidden:
-        {
-        TInt err = iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry);        
-        if ( err == KErrNone && entry.IsHidden())
-            {
-            aValue = EMTPHidden;
-            }
-        else
-            {
-            aValue = EMTPVisible;
-            }        
-        } 
-        break;
+        break;    
     default:
         aValue = 0;//initialization
         //ingore the failure if we can't get properties form MdS
@@ -485,23 +452,21 @@
          */
         TEntry fileEntry;
         TInt err = iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), fileEntry);
-        CMTPImageDpThumbnailCreator* tnc = iDataProvider.ThumbnailManager();
-        if (err == KErrNone && tnc != NULL)
+        if (err == KErrNone)
             {
-            
             if(fileEntry.FileSize() > KFileSizeMax || !alwaysCreate)
                 {
-                tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
+                iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
                 }
             else
                 {
-                tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
+                iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
                 }
             
             /**
              * trap the leave to avoid return general error when PC get object property list
              */
-            TRAP(err, tnc->GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
+            TRAP(err, iDataProvider.ThumbnailManager().GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
             if (err == KErrNone)
                 {
                 iThumbnailCache.iObjectHandle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle);                        
@@ -517,10 +482,6 @@
                     }
                 }
             }
-        else
-            {
-            aValue = KThumbCompressedSize;
-            }
         }
         break;       
        
@@ -636,23 +597,22 @@
              */
             TEntry fileEntry;
             TInt err = iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), fileEntry);
-            CMTPImageDpThumbnailCreator* tnc = iDataProvider.ThumbnailManager();
-            if (err == KErrNone && tnc != NULL)
+            if (err == KErrNone)
                 {
                 
                 if(fileEntry.FileSize() > KFileSizeMax || !alwaysCreate)
                     {
-                    tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
+                    iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
                     }
                 else
                     {
-                    tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
+                    iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
                     }
                 
                 /**
                  * trap the leave to avoid return general error when PC get object property list
                  */
-                TRAP(err, tnc->GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
+                TRAP(err, iDataProvider.ThumbnailManager().GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
                 if (err == KErrNone)
                     {
                     iThumbnailCache.iObjectHandle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle);