From 1c0ee54dedd808a106ca64edd249598def1c9ed3 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sat, 1 Aug 2015 18:44:27 +0000 Subject: SkypeWeb: More fixes & optimization git-svn-id: http://svn.miranda-ng.org/main/trunk@14783 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_proto.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 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 01f3ec57bf..b3c2344ebb 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -38,7 +38,7 @@ public: virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent); - virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); + virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); virtual int __cdecl Authorize(MEVENT hDbEvent); virtual int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason); virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); @@ -117,6 +117,7 @@ private: mir_cs m_InviteDialogsLock; mir_cs m_GCCreateDialogsLock; mir_cs messageSyncLock; + mir_cs m_StatusLock; static mir_cs accountsLock; static mir_cs timerLock; @@ -275,13 +276,9 @@ private: INT_PTR __cdecl OnLeaveChatRoom(WPARAM hContact, LPARAM); void StartChatRoom(const TCHAR *tid, const TCHAR *tname); - void OnLoadChats(const NETLIBHTTPREQUEST *response); - void OnGetChatInfo(const NETLIBHTTPREQUEST *response, void *p); - - void OnChatEvent(const JSONNode &node); void OnSendChatMessage(const TCHAR *chat_id, const TCHAR * tszMessage); char *GetChatUsers(const TCHAR *chat_id); @@ -305,7 +302,7 @@ private: void ProcessThreadUpdateRes(const JSONNode &node); // utils - void CSkypeProto::FreeCharList(LIST lst); + static void CSkypeProto::FreeCharList(LIST lst); __forceinline bool IsOnline() { return (m_iStatus > ID_STATUS_OFFLINE && m_hPollingThread); @@ -335,8 +332,8 @@ private: CMStringA GetServerFromUrl(const char *url); //---Timers - void CALLBACK SkypeUnsetTimer(void*); - void CALLBACK SkypeSetTimer(void*); + void CALLBACK SkypeUnsetTimer(); + void CALLBACK SkypeSetTimer(); void ProcessTimer(); static void CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD); //---/ -- cgit v1.2.3