Steam: some improvements

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

1 files changed, 10 insertions, 17 deletions

diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index 3a742a66b3..853654fd37 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -1,27 +1,18 @@
 #ifndef _STEAM_PROTO_H_

 #define _STEAM_PROTO_H_

 

-struct CaptchaParam

-{

-	BYTE *data;

-	size_t size;

-	char text[10];

-};

-

 struct GuardParam

 {

-	wchar_t emailDomain[32];

 	char code[10];

+	char domain[32];

 };

 

-template<typename T, void (CSteamProto::*Callback)(T*)>

-void CallbackConverter(void *owner, void *arg)

+struct CaptchaParam

 {

-	T *typedArg = (T*)arg;

-	CSteamProto *proto = (CSteamProto*)owner;

-	if (owner != NULL)

-		(proto->*Callback)(typedArg);

-}

+	BYTE *data;

+	size_t size;

+	char text[10];

+};

 

 class CSteamProto : public PROTO<CSteamProto>

 {

@@ -91,16 +82,18 @@ protected:
 	static int CompareProtos(const CSteamProto *p1, const CSteamProto *p2);

 

 	// pooling thread

-	int PollStatus();

+	int PollStatus(const char *sessionId, const char *steamId, UINT32 messageId);

 	void __cdecl PollingThread(void*);

 

 	// account

+	bool IsOnline();

+	void Authorize(SteamWebApi::AuthorizationApi::AuthResult *authResult);

 	void __cdecl LogInThread(void*);

+	void __cdecl LogOutThread(void*);

 

 	// contacts

 	MCONTACT FindContact(const char *steamId);

 	MCONTACT AddContact(const SteamWebApi::FriendApi::Friend &contact);

-	//void OnContactListLoadedAsync(Steam::FriendList::Result *result);

 

 	//events

 	int OnModulesLoaded(WPARAM, LPARAM);