no need to declare the same template in each protocol

2 files changed, 6 insertions, 13 deletions

diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp
index d82d3e46cf..1926c27179 100644
--- a/protocols/Steam/src/steam_menus.cpp
+++ b/protocols/Steam/src/steam_menus.cpp
@@ -3,13 +3,6 @@
 int CSteamProto::hChooserMenu;

 HGENMENU CSteamProto::contactMenuItems[CMI_MAX];

 

-template<int(__cdecl CSteamProto::*Service)(WPARAM, LPARAM)>

-INT_PTR GlobalService(WPARAM hContact, LPARAM lParam)

-{

-	CSteamProto *ppro = CMPlugin::getInstance((MCONTACT)hContact);

-	return ppro ? (ppro->*Service)(hContact, lParam) : 0;

-}

-

 INT_PTR CSteamProto::AuthRequestCommand(WPARAM hContact, LPARAM)

 {

 	ProtoChainSend(hContact, PSS_AUTHREQUEST, 0, 0);

@@ -22,19 +15,19 @@ INT_PTR CSteamProto::AuthRevokeCommand(WPARAM hContact, LPARAM)
 	return 0;

 }

 

-int CSteamProto::BlockCommand(WPARAM hContact, LPARAM)

+INT_PTR CSteamProto::BlockCommand(WPARAM hContact, LPARAM)

 {

 	SendUserIgnoreRequest(hContact, true);

 	return 0;

 }

 

-int CSteamProto::UnblockCommand(WPARAM hContact, LPARAM)

+INT_PTR CSteamProto::UnblockCommand(WPARAM hContact, LPARAM)

 {

 	SendUserIgnoreRequest(hContact, false);

 	return 0;

 }

 

-int CSteamProto::JoinToGameCommand(WPARAM hContact, LPARAM)

+INT_PTR CSteamProto::JoinToGameCommand(WPARAM hContact, LPARAM)

 {

 	char url[MAX_PATH];

 	uint32_t gameId = getDword(hContact, "GameID", 0);

diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index 360a7403b3..f21bcb4869 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -300,9 +300,9 @@ class CSteamProto : public PROTO<CSteamProto>
 	INT_PTR __cdecl AuthRequestCommand(WPARAM, LPARAM);

 	INT_PTR __cdecl AuthRevokeCommand(WPARAM, LPARAM);

 

-	int __cdecl BlockCommand(WPARAM, LPARAM);

-	int __cdecl UnblockCommand(WPARAM, LPARAM);

-	int __cdecl JoinToGameCommand(WPARAM, LPARAM);

+	INT_PTR __cdecl BlockCommand(WPARAM, LPARAM);

+	INT_PTR __cdecl UnblockCommand(WPARAM, LPARAM);

+	INT_PTR __cdecl JoinToGameCommand(WPARAM, LPARAM);

 

 	INT_PTR __cdecl OpenBlockListCommand(WPARAM, LPARAM);