From c89e8a054ac888b27065916ffde96af73404228c Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Sat, 4 Apr 2015 20:10:50 +0000 Subject: SkypeWeb: - history sync (patch from MikalaiR) - refactored message sending git-svn-id: http://svn.miranda-ng.org/main/trunk@12599 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_proto.h | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'protocols/SkypeWeb/src/skype_proto.h') diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h index 5e598a8e99..1be152508d 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -1,21 +1,8 @@ #ifndef _SKYPE_PROTO_H_ #define _SKYPE_PROTO_H_ -struct SendMessageParam -{ - MCONTACT hContact; - HANDLE hMessage; - const char *msg; - int flags; -}; - -enum ARG_FREE_TYPE -{ - ARG_NO_FREE, - ARG_MIR_FREE -}; - typedef void(CSkypeProto::*SkypeResponseCallback)(const NETLIBHTTPREQUEST *response); +typedef void(CSkypeProto::*SkypeResponseWithArgCallback)(const NETLIBHTTPREQUEST *response, void *arg); struct CSkypeProto : public PROTO < CSkypeProto > { @@ -116,7 +103,9 @@ private: INT_PTR __cdecl OnAccountManagerInit(WPARAM, LPARAM); // requests - void PushRequest(HttpRequest *request, SkypeResponseCallback response = NULL); + void PushRequest(HttpRequest *request); + void PushRequest(HttpRequest *request, SkypeResponseCallback response); + void PushRequest(HttpRequest *request, SkypeResponseWithArgCallback response, void *arg); // icons static IconInfo Icons[]; @@ -184,10 +173,11 @@ private: int __cdecl OnContactDeleted(MCONTACT, LPARAM); // messages - int OnReceiveMessage(const char *from, const char *convLink, time_t timeStamp, char *content); + int OnReceiveMessage(const char *from, const char *convLink, time_t timestamp, char *content); int OnSendMessage(MCONTACT hContact, int flags, const char *message); void __cdecl CSkypeProto::SendMsgThread(void *arg); void OnMessageSent(const NETLIBHTTPREQUEST *response, void *arg); + void OnGetServerHistory(const NETLIBHTTPREQUEST *response); //polling void __cdecl ParsePollData(JSONNODE *data); void __cdecl PollingThread(void*); -- cgit v1.2.3