diff -r cbb19216b74d -r 00c6709d25aa datacommsserver/esockserver/ssock/ss_connLegacy.cpp
--- a/datacommsserver/esockserver/ssock/ss_connLegacy.cpp	Thu Jul 15 20:01:43 2010 +0300
+++ b/datacommsserver/esockserver/ssock/ss_connLegacy.cpp	Thu Aug 19 11:05:47 2010 +0300
@@ -62,12 +62,6 @@
 
 //const TInt KNumberOfEmulatedSubConnections = 2;
 
-const Factories::TAnyFn AConnectionLegacy::iInterfaceVTableF[] =
-	{
-	(Factories::TAnyFn)1,
-	(Factories::TAnyFn)(TFactoryNotify<AConnectionLegacy>::Notification)
-	};
-
 AConnectionLegacy::~AConnectionLegacy()
     {
    	TSubConnectionEvent* subConnectionEvent;
@@ -130,7 +124,7 @@
 	}
 
 
-static const TUid K_CIPProtoConnectionProviderFactory_iUid = {0x10281DD3};
+//static const TUid K_CIPProtoConnectionProviderFactory_iUid = {0x10281DD3};
 
 void AConnectionLegacy::CompleteAttachL(ESock::TSelectionPrefs& aPrefs)
 	{
@@ -146,7 +140,7 @@
     __ASSERT_DEBUG(cpr->GetFirstClient<TDefaultClientMatchPolicy>(TClientType(TCFClientType::EServProvider))==NULL, User::Panic(KSpecAssert_ESockSSockscnLgc, 3)); //This is why we are "legacy"
 
 	CConnectionFactoryContainer& container = *static_cast<CPlayer&>(iConnection.Player()).SockManGlobals()->iConnectionFactories;
-	CCommsFactoryBase* factory = static_cast<CCommsFactoryBase*>(container.FindFactory(K_CIPProtoConnectionProviderFactory_iUid));
+	CCommsFactoryBase* factory = static_cast<CCommsFactoryBase*>(container.FindFactory(TUid::Uid(KIPProtoConnectionProviderFactoryUid)));
     User::LeaveIfError(factory? KErrNone : KErrArgument);
 
     XConnectionFactoryAPQuery query(static_cast<const TCommDbConnPref&>(cp).IapId());
@@ -900,40 +894,6 @@
 	iConnection.DontCompleteCurrentRequest();
 	}
 
-
-
-void AConnectionLegacy::InterfaceStateChangeNotification(TDesC8& /*aInfo*/)
-	{
-	//[399TODO] implement InterfaceStateChangeNotification
-	LOG(ESockLog::Printf(KESockConnectionTag, _L8("TODO: implement InterfaceStateChangeNotification - KErrNotSupported")));
-#if TODO_IMPLEMENT_THIS
-	TInterfaceNotification& interfaceNotification = ((TInterfaceNotificationBuf&)aInfo)();
-
-	if(iAllInterfaceNotificationMessage.IsNull())
-		{
-		iInterfaceChangeQueue.Enque(interfaceNotification);
-		return;
-		}
-	else // request is outstanding
-		{
-		if(!iInterfaceChangeQueue.IsEmpty())
-			{
-			// can this situation ever happen?
-			// - new requests fullfilled from queue before becoming outstanding
-			// - no queued items when request outstanding
-
-			// But in case we do...
-			// should we get oldest change first in case this new one overwrites it
-			iInterfaceChangeQueue.Enque(interfaceNotification);
-			iInterfaceChangeQueue.Deque(interfaceNotification);
-			}
-
-		TInt ret = iAllInterfaceNotificationMessage.Write(0, aInfo);
-		CompleteMessage(iAllInterfaceNotificationMessage, ret);
-		}
-#endif
-	}
-
 void AConnectionLegacy::SubConnectionEvent(const TSubConnectionEvent& aSubConnectionEvent)
 	{
 	// Pass the message onto the client if possible, or buffer if necessary