# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1270062941 -10800 # Node ID 96b99892dd8079976a8f5c339c639973850596e5 # Parent aca99fb8a3dde4bd77ca623e368f3f1377f5616b Revision: 201010 Kit: 201013 diff -r aca99fb8a3dd -r 96b99892dd80 XDMEngine/src/XdmDocument.cpp --- a/XDMEngine/src/XdmDocument.cpp Mon Mar 15 12:42:13 2010 +0200 +++ b/XDMEngine/src/XdmDocument.cpp Wed Mar 31 22:15:41 2010 +0300 @@ -97,12 +97,11 @@ #ifdef _DEBUG iXdmEngine.WriteToLog( _L8( "CXdmDocument::EmptyOperationQueue()" ) ); #endif - MXdmOperation* operation = NULL; - TInt count = iChangeRequests.Count(); - for( TInt i = 0;i < count;i++ ) + + while (iChangeRequests.Count()) { - operation = iChangeRequests[i]; - iChangeRequests.Remove( i ); + MXdmOperation* operation = iChangeRequests[0]; + iChangeRequests.Remove( 0 ); operation->Destroy(); operation = NULL; } diff -r aca99fb8a3dd -r 96b99892dd80 package_definition.xml --- a/package_definition.xml Mon Mar 15 12:42:13 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r aca99fb8a3dd -r 96b99892dd80 simpledatamodeladapter/src/presencepluginvirtualgroup.cpp --- a/simpledatamodeladapter/src/presencepluginvirtualgroup.cpp Mon Mar 15 12:42:13 2010 +0200 +++ b/simpledatamodeladapter/src/presencepluginvirtualgroup.cpp Wed Mar 31 22:15:41 2010 +0300 @@ -102,7 +102,9 @@ for ( TInt i=0; i < count; i++ ) { MXIMPIdentity* member = myFactory.NewIdentityLC(); - member->SetIdentityL( (*iVirtualMember)[i] ); + HBufC* withoutPrefix = iPresenceData->RemovePrefixLC( (*iVirtualMember)[i] ); + member->SetIdentityL( *withoutPrefix ); + CleanupStack::PopAndDestroy( withoutPrefix ); // create here MXIMPPresentityGroupMemberInfo MPresentityGroupMemberInfo* info = iConnObs.PresenceObjectFactoryOwn(). diff -r aca99fb8a3dd -r 96b99892dd80 xdmprotocols/XcapProtocol/src/XcapDocument.cpp --- a/xdmprotocols/XcapProtocol/src/XcapDocument.cpp Mon Mar 15 12:42:13 2010 +0200 +++ b/xdmprotocols/XcapProtocol/src/XcapDocument.cpp Wed Mar 31 22:15:41 2010 +0300 @@ -908,11 +908,11 @@ #ifdef _DEBUG iXcapProtocol.WriteToLog( _L8( "CXcapDocument::DequeueAll()" ) ); #endif - TInt count = iChangeRequests.Count(); - for( TInt i = 0;i < count;i++ ) + + while (iChangeRequests.Count() ) { - MXdmOperation* request = iChangeRequests[i]; - iChangeRequests.Remove( i ); + MXdmOperation* request = iChangeRequests[0]; + iChangeRequests.Remove( 0 ); request->Destroy(); request = NULL; }