--- 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;
         }

--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="legacypresence" name="Legacy Presence Services" levels="engine fw ui">
-    <collection id="xdmengine" name="XDM Engine" level="engine">
-      <component id="xdmsettingsapi" filter="s60" name="XDM Settings Api">
-        <!-- <unit bldFile="xdmengine/xdmsettingsapi/group"/> -->
-      </component>
-      <component id="xdmprovisioning" filter="s60" name="XDM Provisioning">
-        <!-- <unit bldFile="xdmengine/xdmprovisioning/group"/> -->
-      </component>
-      <component id="xdmdevicemanagement" filter="s60" name="XDM Device Management">
-        <!-- <unit bldFile="xdmengine/xdmdevicemanagement/group"/> -->
-      </component>
-      <component id="xdmengine_build" filter="s60" name="XDM Engine Build">
-      	<!--  should move the necesary parts into the above components, or collapse them all into one -->
-        <unit bldFile="xdmengine/group"/>
-      </component>
-    </collection>
-    <collection id="xdmsettingsui" name="XDM Settings UI" level="ui">
-      <component id="xdmsettingsui_help" filter="s60" name="XDM Settings UI Help">
-        <unit bldFile="xdmsettingsui/help/group"/>
-      </component>
-      <component id="xdmsettingsui_build" filter="s60" name="XDM Settings UI Build">
-        <unit bldFile="xdmsettingsui/group"/>
-      </component>
-    </collection>
-    <collection id="msgconnmanager" name="Messaging Connection Manager" level="fw">
-      <component id="msgconnmanager_build" filter="s60" name="Messaging Connection Manager Build">
-        <unit bldFile="msgconnmanager/group"/>
-      </component>
-    </collection>
-    <collection id="presencefwsimpleadpt" name="Presence Framework SIMPLE Adaptation" level="fw">
-      <component id="simpleplugin" filter="s60" class="plugin" name="SIMPLE Plugin">
-        <unit bldFile="presencefwsimpleadpt/group"/>
-      </component>
-    </collection>
-    <collection id="presencesettingsui" name="Presence Settings UI" level="ui">
-      <component id="presencesettingsui_help" filter="s60" name="Presence Settings UI Help">
-        <unit bldFile="presencesettingsui/help/group"/>
-      </component>
-      <component id="presencesettingsui_build" filter="s60" name="Presence Settings UI Build">
-        <unit bldFile="presencesettingsui/group"/>
-      </component>
-    </collection>
-    <collection id="simpleengine" name="SIMPLE Engine" level="engine">
-      <component id="presencesettingsapi" filter="s60" name="Presence Settings API">
-        <!-- <unit bldFile="simpleengine/presencesettingsapi/group"/> -->
-      </component>
-      <component id="siputils" filter="s60" name="SIP Utils">
-        <!-- <unit bldFile="simpleengine/siputils/group"/> -->
-      </component>
-      <component id="xmlutils" filter="s60" name="XML Utils">
-        <!-- <unit bldFile="simpleengine/xmlutils/group"/> -->
-      </component>
-      <component id="simpleengine_engine" filter="s60" name="Engine">
-        <!-- <unit bldFile="simpleengine/engine/group"/> -->
-      </component>
-      <component id="xdmrlspres" filter="s60" name="RLS and Presence XDM">
-        <!-- <unit bldFile="simpleengine/xdmrlspres/group"/> -->
-      </component>
-      <component id="presencedm" filter="s60" name="Presence DM Adapter" class="plugin">
-        <!-- <unit bldFile="simpleengine/presencedm/group"/> -->
-      </component>
-      <component id="presenceprovisioning" filter="s60" name="Presence Provisioning" class="plugin">
-        <!-- <unit bldFile="simpleengine/presenceprovisioning/group"/> -->
-      </component>
-      <component id="simpleengine_build" filter="s60" name="SIMPLE Engine Build">
-      	<!--  should move the necesary parts into the above components, or collapse them all into one -->
-        <unit bldFile="simpleengine/group"/>
-      </component>
-    </collection>
-    <collection id="xdmprotocols" name="XDM Protocols" level="fw">
-      <component id="xdmxmlparser" filter="s60" name="XDM XML Parser">
-        <!-- <unit bldFile="xdmprotocols/xdmxmlparser/group"/> -->
-      </component>
-      <component id="xcapprotocol" filter="s60" name="Xcap Protocol">
-        <!-- <unit bldFile="xdmprotocols/xcapprotocol/group"/> -->
-        <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapappusage/group"/> -->
-        <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapcache/client/group"/> -->
-        <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapcache/server/group"/> -->
-        <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcaphttptransport/group"/> -->
-        <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcapoperations/group"/> -->
-        <!-- <unit bldFile="xdmprotocols/xcapprotocol/xcaputils/group"/> -->
-      </component>
-      <component id="localprotocol" filter="s60" name="Local Protocol">
-        <!-- <unit bldFile="xdmprotocols/localprotocol/group"/> -->
-        <!-- <unit bldFile="xdmprotocols/localprotocol/localoperations/group"/> -->
-      </component>
-      <component id="xdmprotocols_build" filter="s60" name="XDM Protocols Build">
-      	<!--  should move the necesary parts into the above components, or collapse them all into one -->
-        <unit bldFile="xdmprotocols/group"/>
-      </component>
-    </collection>
-    <collection id="simpledatamodeladapter" name="SIMPLE Data Model Adapter" level="fw">
-      <component id="presenceplugin" filter="s60" class="plugin"  name="Presence Plugin" introduced="^2">
-        <unit bldFile="simpledatamodeladapter/group"/>
-      </component>
-    </collection>
-    <collection id="legacypresence_info" name="Legacy Presence Services Info" level="ui">
-      <component id="pressrv_plat" filter="s60" class="api" name="Legacy Presence Services Platform Interfaces">
-        <unit bldFile="pressrv_plat/group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>

--- 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().

--- 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;
     	}