diff options
| author | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-04 16:00:18 +0000 |
|---|---|---|
| committer | MikalaiR <nikolay.romanovich@narod.ru> | 2015-05-04 16:00:18 +0000 |
| commit | f3b0cce816e602fbafb0fc018a3c13a8fb51b1b3 (patch) | |
| tree | ea68f59441794ff78796a391e66424cd65d1bed0 /protocols | |
| parent | 45d405f85cfb7929320c726a9272e5bec8eb97f9 (diff) | |
SkypeWeb: Cleanup.
git-svn-id: http://svn.miranda-ng.org/main/trunk@13425 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/SkypeWeb/src/skype_accounts.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.cpp | 2 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_proto.h | 1 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_utils.cpp | 4 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/stdafx.h | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/protocols/SkypeWeb/src/skype_accounts.cpp b/protocols/SkypeWeb/src/skype_accounts.cpp index 16eefcad3a..c3a04aaaef 100644 --- a/protocols/SkypeWeb/src/skype_accounts.cpp +++ b/protocols/SkypeWeb/src/skype_accounts.cpp @@ -17,7 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "stdafx.h"
-LIST<CSkypeProto> CSkypeProto::Accounts(1, CSkypeProto::CompareAccounts);
+LIST<CSkypeProto> Accounts(1, CSkypeProto::CompareAccounts);
int CSkypeProto::CompareAccounts(const CSkypeProto *p1, const CSkypeProto *p2)
{
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp index 08ee6eabad..f21e2e9e3e 100644 --- a/protocols/SkypeWeb/src/skype_proto.cpp +++ b/protocols/SkypeWeb/src/skype_proto.cpp @@ -71,8 +71,6 @@ PROTO<CSkypeProto>(protoName, userName), password(NULL) //sounds
SkinAddNewSoundEx("skype_inc_call", "SkypeWeb", LPGEN("Incoming call sound") );
SkinAddNewSoundEx("skype_call_canceled", "SkypeWeb", LPGEN("Incoming call canceled sound") );
-
- skypeInstances.insert(this);
}
CSkypeProto::~CSkypeProto()
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h index 9c9ac6df8a..cd358905aa 100644 --- a/protocols/SkypeWeb/src/skype_proto.h +++ b/protocols/SkypeWeb/src/skype_proto.h @@ -103,7 +103,6 @@ private: m_hPopupClassCall;
// accounts
- static LIST<CSkypeProto> Accounts;
char *Server, *RegToken, *TokenSecret, *EndpointId, *SelfSkypeName;
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp index eb132943a7..00b42fb4f0 100644 --- a/protocols/SkypeWeb/src/skype_utils.cpp +++ b/protocols/SkypeWeb/src/skype_utils.cpp @@ -743,9 +743,9 @@ void CSkypeProto::ProcessTimer() static VOID CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD)
{
- for (int i = 0; i < skypeInstances.getCount(); i++)
+ for (int i = 0; i < Accounts.getCount(); i++)
{
- skypeInstances[i]->ProcessTimer();
+ Accounts[i]->ProcessTimer();
}
}
diff --git a/protocols/SkypeWeb/src/stdafx.h b/protocols/SkypeWeb/src/stdafx.h index dd1b5411d3..8a88f3e054 100644 --- a/protocols/SkypeWeb/src/stdafx.h +++ b/protocols/SkypeWeb/src/stdafx.h @@ -62,7 +62,7 @@ struct CSkypeProto; extern HINSTANCE g_hInstance;
extern char g_szMirVer[];
-extern LIST<CSkypeProto> skypeInstances;
+extern LIST<CSkypeProto> Accounts;
#define SKYPE_ENDPOINTS_HOST "client-s.gateway.messenger.live.com"
|