--- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp	Fri Apr 16 15:51:48 2010 +0300
+++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp	Mon May 03 13:19:02 2010 +0300
@@ -470,22 +470,21 @@
 
 TMTPTypeGuid* CMTPGetDevicePropDesc::GetGUIDL(const TUint aKey)
     {
-    
-    TBuf8<KMTPTypeUINT128Size> ptr;
+    TBuf<KGUIDFormatStringLength> buf;
     
-    iRepository->Get(aKey,ptr);
-    
-    TMTPTypeGuid* ret = new (ELeave) TMTPTypeGuid( ptr );
+    User::LeaveIfError(iRepository->Get(aKey,buf));
+
+    TMTPTypeGuid* ret = new (ELeave) TMTPTypeGuid( buf );
     
     return ret;
     }
 
 void CMTPGetDevicePropDesc::SaveGUID( const TUint aKey,  TMTPTypeGuid& aValue )
     {
-    TPtrC8 ptr;
-    if ( KMTPChunkSequenceCompletion == aValue.FirstReadChunk(ptr) )
-    	{
-    	iRepository->Set(aKey,ptr);
-    	}
+	TBuf<KGUIDFormatStringLength> buf;
+	if(aValue.ToString(buf) == KErrNone)
+		{
+		iRepository->Set(aKey,buf);
+		}
     }