- all static protocol services replaced with functions;

- m_protomod.h removed as useless

git-svn-id: http://svn.miranda-ng.org/main/trunk@14260 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 3 insertions, 5 deletions

diff --git a/protocols/Steam/src/main.cpp b/protocols/Steam/src/main.cpp
index fa597983d9..5f67cea6a6 100644
--- a/protocols/Steam/src/main.cpp
+++ b/protocols/Steam/src/main.cpp
@@ -44,7 +44,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	pd.type = PROTOTYPE_PROTOCOL;

 	pd.fnInit = (pfnInitProto)CSteamProto::InitProtoInstance;

 	pd.fnUninit = (pfnUninitProto)CSteamProto::UninitProtoInstance;

-	CallService(MS_PROTO_REGISTERMODULE, 0, (LPARAM)&pd);

+	Proto_RegisterModule(&pd);

 

 	char iconName[100];

 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, "gaming");

diff --git a/protocols/Steam/src/stdafx.h b/protocols/Steam/src/stdafx.h
index 489c994784..7aecea533b 100644
--- a/protocols/Steam/src/stdafx.h
+++ b/protocols/Steam/src/stdafx.h
@@ -23,7 +23,6 @@
 #include <m_freeimage.h>

 #include <m_imgsrvc.h>

 #include <m_protocols.h>

-#include <m_protomod.h>

 #include <m_protosvc.h>

 #include <m_protoint.h>

 #include <m_idle.h>

diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index 72a5422e5a..f9a6b0c0c0 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -296,7 +296,7 @@ MCONTACT CSteamProto::AddContact(const char *steamId, bool isTemporary)
 	{
 		// create contact
 		hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0);
-		CallService(MS_PROTO_ADDTOCONTACT, hContact, (LPARAM)this->m_szModuleName);
+		Proto_AddToContact(hContact, this->m_szModuleName);
 
 		setString(hContact, "SteamID", steamId);
 
diff --git a/protocols/Steam/src/steam_instances.cpp b/protocols/Steam/src/steam_instances.cpp
index edd1eaef7f..d535e53b09 100644
--- a/protocols/Steam/src/steam_instances.cpp
+++ b/protocols/Steam/src/steam_instances.cpp
@@ -32,8 +32,7 @@ void CSteamProto::UninitProtoInstances()
 

 CSteamProto* CSteamProto::GetContactProtoInstance(MCONTACT hContact)

 {

-	char *proto = (char *)::CallService(MS_PROTO_GETCONTACTBASEPROTO, hContact, 0);

-

+	char *proto = GetContactProto(hContact);

 	if (proto == NULL)

 		return NULL;