--- a/datacommsserver/esockserver/test/providers/dummy/src/dummypr_metaconnprov.cpp	Thu Jan 07 13:34:53 2010 +0200
+++ b/datacommsserver/esockserver/test/providers/dummy/src/dummypr_metaconnprov.cpp	Mon Jan 18 21:26:35 2010 +0200
@@ -20,7 +20,6 @@
  @internalComponent
 */
 
-
 #include <comms-infras/ss_log.h>
 #include <comms-infras/coremcprstates.h>
 #include <comms-infras/coremcpractivities.h>
@@ -40,8 +39,6 @@
 using namespace Messages;
 using namespace MeshMachine;
 
-
-
 CDummyMetaConnectionProvider* CDummyMetaConnectionProvider::NewL(CMetaConnectionProviderFactoryBase& aFactory,
                                                                      const TProviderInfo& aProviderInfo)
 	{
@@ -62,16 +59,14 @@
 
 CDummyMetaConnectionProvider::~CDummyMetaConnectionProvider()
 	{
-	delete iPubSubAvailability;
-	delete iPubSubStopTrigger;
+	delete iPubSubSubscriber;
 	LOG_NODE_DESTROY(KDummyMCprTag, CDummyMetaConnectionProvider);
 	}
 
 void CDummyMetaConnectionProvider::ConstructL()
     {
     CMobilityMetaConnectionProvider::ConstructL();
-    iPubSubAvailability = CMCPrPubSubAvailability::NewL(*this, ProviderInfo().APId());
-    iPubSubStopTrigger  = CMCPrPubSubStopTrigger::NewL(*this, 0);
+    iPubSubSubscriber = CMCPrPubSubSubscriber::NewL(*this, ProviderInfo().APId());
     }
 
 void CDummyMetaConnectionProvider::ReceivedL(const TRuntimeCtxId& aSender, const TNodeId& aRecipient, TSignatureBase& aMessage)
@@ -89,19 +84,18 @@
     {
     if (!GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::EServProvider)))
         {
-        ASSERT(iPubSubAvailability!=NULL);
-        RNodeInterface* peer = AddClientL(iPubSubAvailability->Id(), TClientType(TClientType::ERegistrar, TCFClientType::EAvailabilityProvider));
-        iPubSubAvailability->StartAvailabilityMonitoringL(aAvailabilityActivity);
+        ASSERT(iPubSubSubscriber!=NULL);
+        RNodeInterface* peer = AddClientL(iPubSubSubscriber->Id(), TClientType(TClientType::ERegistrar, TCFClientType::EAvailabilityProvider));
+        iPubSubSubscriber->StartAvailabilityMonitoringL(aAvailabilityActivity);
         }
     }
 
 void CDummyMetaConnectionProvider::CancelAvailabilityMonitoring()
     {
     if (!GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::EServProvider)))
-        {
-        ASSERT(iPubSubAvailability!=NULL);
-        RemoveClient(iPubSubAvailability->Id());
-        iPubSubAvailability->CancelAvailabilityMonitoring();
+        {    
+        ASSERT(iPubSubSubscriber!=NULL);    
+        RemoveClient(iPubSubSubscriber->Id());
+        iPubSubSubscriber->CancelAvailabilityMonitoring();
         }
     }
-