--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp	Wed Apr 14 16:49:36 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp	Tue Apr 27 17:30:23 2010 +0300
@@ -398,29 +398,29 @@
         
     case EFormatExtensionSets:
         {
-        _LIT(KFormatExtensionJpg, "0x3801:jpg::3");//3 means file dp will enumerate all image files instead of image dp.
+        _LIT(KFormatExtensionJpg, "0x3801:jpg:::3");//3 means file dp will enumerate all image files instead of image dp.
         aStrings.AppendL(KFormatExtensionJpg);
-        _LIT(KFormatExtensionJpe, "0x3801:jpe::3");
+        _LIT(KFormatExtensionJpe, "0x3801:jpe:::3");
         aStrings.AppendL(KFormatExtensionJpe);
-        _LIT(KFormatExtensionJpeg, "0x3801:jpeg::3");
+        _LIT(KFormatExtensionJpeg, "0x3801:jpeg:::3");
         aStrings.AppendL(KFormatExtensionJpeg);
         
         /*
          * bmp files
          */
-        _LIT(KFormatExtensionBmp, "0x3804:bmp::3");
+        _LIT(KFormatExtensionBmp, "0x3804:bmp:::3");
         aStrings.AppendL(KFormatExtensionBmp);
         
         /*
          * gif files
          */
-        _LIT(KFormatExtensionGif, "0x3807:gif::3");
+        _LIT(KFormatExtensionGif, "0x3807:gif:::3");
         aStrings.AppendL(KFormatExtensionGif);
         
         /*
          * png files
          */
-        _LIT(KFormatExtensionPng, "0x380B:png::3");
+        _LIT(KFormatExtensionPng, "0x380B:png:::3");
         aStrings.AppendL(KFormatExtensionPng);
         
         /*
@@ -663,6 +663,11 @@
     /**
      * copy file extension by insensitive case
      */
+    if (aExtension.Length() > KMaxExtNameLength)
+        {
+        return KNullDesC;
+        }
+    
     TBuf<KMaxExtNameLength> extension;
     extension.CopyLC(aExtension);
     
@@ -718,29 +723,6 @@
     return newPictures;
     }
 
-TBool CMTPImageDataProvider::GetCacheParentHandle(const TDesC& aParentPath, TUint32& aParentHandle)
-    {
-    TBool ret = EFalse;
-    
-    if (iParentCache.iPath.Compare(aParentPath) == 0)
-        {
-        aParentHandle = iParentCache.iHandle;
-        ret = ETrue;
-        }
-    else
-        {
-        aParentHandle = KMTPHandleNone;
-        }
-    
-    return ret;
-    }
-
-void CMTPImageDataProvider::SetCacheParentHandle(const TDesC& aParentPath, TUint32 aParentHandle)
-    {
-    iParentCache.iPath.Copy(aParentPath);
-    iParentCache.iHandle = aParentHandle;
-    }
-
 void CMTPImageDataProvider::AppendDeleteObjectsArrayL(const TDesC& aSuid)
     {
     iDeleteObjectsArray.AppendL(aSuid.AllocLC());