From 9c4370db4f2e5f5ee77e03a8c5c4c1e226274768 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sat, 15 Aug 2015 13:10:56 +0000 Subject: SkypeWeb: refactoring part 1 git-svn-id: http://svn.miranda-ng.org/main/trunk@14960 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 66be5509b1..366acb6c97 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -24,6 +24,8 @@ typedef void(CSkypeProto::*SkypeResponseWithArgCallback)(const NETLIBHTTPREQUEST struct CSkypeProto : public PROTO < CSkypeProto > { friend CSkypeGCCreateDlg; + //friend CSkypeChatroom; + //friend ChatUser; public: @@ -82,6 +84,8 @@ public: private: + LoginInfo li; + static UINT_PTR m_timer; //---Accounts @@ -119,13 +123,6 @@ private: mir_cs m_AppendMessageLock; static mir_cs accountsLock; static mir_cs timerLock; - - - ptrA m_szServer, - m_szRegToken, - m_szTokenSecret, - m_szEndpointId, - m_szSelfSkypeName; static CSkypeProto* GetContactAccount(MCONTACT hContact); int __cdecl OnAccountLoaded(WPARAM, LPARAM); @@ -308,7 +305,7 @@ private: } __forceinline bool IsMe(const char *szSkypename) - { return (!mir_strcmpi(szSkypename, m_szSelfSkypeName) || !mir_strcmp(szSkypename, ptrA(getStringA("SelfEndpointName")))); + { return (!mir_strcmpi(szSkypename, li.szSkypename) || !mir_strcmp(szSkypename, ptrA(getStringA("SelfEndpointName")))); } MEVENT AddEventToDb(MCONTACT hContact, WORD type, DWORD timestamp, DWORD flags, DWORD cbBlob, PBYTE pBlob); -- cgit v1.2.3