diff -r 50c53e893c3f -r 1221b68b8a5f omadrm/drmengine/roap/src/RoapEng.cpp --- a/omadrm/drmengine/roap/src/RoapEng.cpp Thu Aug 19 10:12:10 2010 +0300 +++ b/omadrm/drmengine/roap/src/RoapEng.cpp Tue Aug 31 15:29:38 2010 +0300 @@ -80,6 +80,7 @@ #include "DcfEntry.h" #include "Base64.h" #include "drmsettingsplugininternalcrkeys.h" +#include "buffercontainers.h" #define STUB_C_CLASS_IN_NAMESPACE( n, c ) namespace n { class c: public CBase { private: c(); public: virtual ~c(); }; } n::c::c() {} n::c::~c() {} @@ -2162,7 +2163,7 @@ #ifndef __WINS__ TInt numPhone = 0; TUint32 caps = 0; - TName tsyName; + DRM::CNameContainer* tsyName(NULL); RMobilePhone phone; RTelServer etelServer; RTelServer::TPhoneInfo phoneInfo; @@ -2173,18 +2174,20 @@ CleanupClosePushL( etelServer ); User::LeaveIfError( etelServer.LoadPhoneModule( KMmTsyModuleName ) ); - User::LeaveIfError( etelServer.EnumeratePhones( numPhone) ); + User::LeaveIfError( etelServer.EnumeratePhones( numPhone ) ); + tsyName = DRM::CNameContainer::NewLC(); for (TInt i(0); i < numPhone; i++) { User::LeaveIfError( etelServer.GetPhoneInfo( i, phoneInfo ) ); - User::LeaveIfError( etelServer.GetTsyName( i,tsyName ) ); + User::LeaveIfError( etelServer.GetTsyName( i,tsyName->iBuffer ) ); - if ( tsyName.CompareF( KMmTsyModuleName ) == 0) + if ( !tsyName->iBuffer.CompareF( KMmTsyModuleName ) ) { break; } } + CleanupStack::PopAndDestroy( tsyName ); User::LeaveIfError( phone.Open( etelServer, phoneInfo.iName ) ); CleanupClosePushL( phone ); @@ -2363,7 +2366,7 @@ TPair pair; pair.iCid = aContentIDs[i]; pair.iTtid = aTransIDs[i]; - array.Append( pair ); + array.AppendL( pair ); } iDcfRep->SetTtid( array, status );