5 files changed, 7 insertions, 7 deletions
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index c13dfe190d..7f9d6a3ec2 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -141,8 +141,6 @@ procedure KillModuleServices(hInst:HINST); stdcall;
 procedure KillObjectServices(var ptr); stdcall;
                  external CoreDLL name 'KillObjectServices';
 
-function CallContactService(hContact:TMCONTACT;const name:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; stdcall;
-                 external AppDLL name 'CallContactService';
 function CallProtoService(const szModule:PAnsiChar;const szService:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; stdcall;
                  external AppDLL name 'CallProtoService';
 
diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc
index 31f9456782..5fb1c39ad7 100644
--- a/include/delphi/m_protocols.inc
+++ b/include/delphi/m_protocols.inc
@@ -38,9 +38,6 @@ type
     lParam        : LPARAM;
   end;
 
-const
-  MS_PROTO_CALLCONTACTSERVICE:PAnsiChar = 'Proto/CallContactService';
-
 //a general network 'ack'
 //wParam=0
 //lParam=(LPARAM)(ACKDATA*)&ack
diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc
index 664b8552c6..83e1c2a841 100644
--- a/include/delphi/m_protosvc.inc
+++ b/include/delphi/m_protosvc.inc
@@ -635,7 +635,7 @@ const
 }
   PS_GETUNREADEMAILCOUNT = '/GetUnreadEmailCount';
 
-// these should be called with CallContactService()
+// these should be called with ProtoChainSend()
 
 {<</
     !IMPORTANT!
diff --git a/include/m_core.h b/include/m_core.h
index 04bbacc2af..f4c6fcaea0 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -123,7 +123,6 @@ MIR_CORE_DLL(void)    KillModuleServices(HINSTANCE hInst);
 MIR_CORE_DLL(void)    KillObjectServices(void* pObject);
 
 MIR_APP_DLL(int)      ProtoServiceExists(LPCSTR szModule, const char *szService);
-MIR_APP_DLL(INT_PTR)  CallContactService(MCONTACT, const char*, WPARAM wParam = 0, LPARAM lParam = 0);
 MIR_APP_DLL(INT_PTR)  CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam = 0, LPARAM lParam = 0);
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/include/m_protocols.h b/include/m_protocols.h
index 01997885e2..7bfe515eab 100644
--- a/include/m_protocols.h
+++ b/include/m_protocols.h
@@ -477,6 +477,12 @@ EXTERN_C MIR_APP_DLL(int) Proto_RemoveFromContact(MCONTACT, const char *szProto)
 
 EXTERN_C MIR_APP_DLL(INT_PTR) Proto_ChainSend(int iOrder, CCSDATA *ccs);
 
+__forceinline INT_PTR ProtoChainSend(MCONTACT hContact, const char *szProtoService, WPARAM wParam, LPARAM lParam)
+{
+	CCSDATA ccs = { hContact, szProtoService, wParam, lParam };
+	return Proto_ChainSend(0, &ccs);
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 // Call the next service in the chain for this receive operation
 // The return value should be returned immediately