From 2bb514f4195c99b52e0ec748c975c0fd30dbbd25 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 1 Jun 2015 18:10:32 +0000 Subject: another bunch of dead crutches: non-unicode avatar services git-svn-id: http://svn.miranda-ng.org/main/trunk@13961 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/VKontakte/src/vk_avatars.cpp | 10 +++++----- protocols/VKontakte/src/vk_proto.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/VKontakte/src') diff --git a/protocols/VKontakte/src/vk_avatars.cpp b/protocols/VKontakte/src/vk_avatars.cpp index f5a7046171..60cf0b8df1 100644 --- a/protocols/VKontakte/src/vk_avatars.cpp +++ b/protocols/VKontakte/src/vk_avatars.cpp @@ -22,7 +22,7 @@ void CVkProto::OnReceiveAvatar(NETLIBHTTPREQUEST *reply, AsyncHttpRequest* pReq) if (reply->resultCode != 200) return; - PROTO_AVATAR_INFORMATIONT AI = { sizeof(AI) }; + PROTO_AVATAR_INFORMATION AI = { sizeof(AI) }; GetAvatarFileName((MCONTACT)pReq->pUserInfo, AI.filename, SIZEOF(AI.filename)); AI.format = ProtoGetBufferFormat(reply->pData); @@ -66,14 +66,14 @@ void CVkProto::ReloadAvatarInfo(MCONTACT hContact) CallService(MS_AV_REPORTMYAVATARCHANGED, (WPARAM)m_szModuleName, 0); return; } - PROTO_AVATAR_INFORMATIONT AI = { sizeof(AI) }; + PROTO_AVATAR_INFORMATION AI = { sizeof(AI) }; AI.hContact = hContact; SvcGetAvatarInfo(0, (LPARAM)&AI); } INT_PTR CVkProto::SvcGetAvatarInfo(WPARAM, LPARAM lParam) { - PROTO_AVATAR_INFORMATIONT* AI = (PROTO_AVATAR_INFORMATIONT*)lParam; + PROTO_AVATAR_INFORMATION* AI = (PROTO_AVATAR_INFORMATION*)lParam; ptrA szUrl(getStringA(AI->hContact, "AvatarUrl")); if (szUrl == NULL) @@ -109,7 +109,7 @@ INT_PTR CVkProto::SvcGetAvatarInfo(WPARAM, LPARAM lParam) INT_PTR CVkProto::SvcGetMyAvatar(WPARAM wParam, LPARAM lParam) { debugLogA("CVkProto::SvcGetMyAvatar"); - PROTO_AVATAR_INFORMATIONT AI = { sizeof(AI) }; + PROTO_AVATAR_INFORMATION AI = { sizeof(AI) }; AI.hContact = NULL; if (SvcGetAvatarInfo(0, (LPARAM)&AI) != GAIR_SUCCESS) return 1; @@ -159,7 +159,7 @@ void CVkProto::SetAvatarUrl(MCONTACT hContact, CMString &tszUrl) else { setTString(hContact, "AvatarUrl", tszUrl); setByte(hContact,"NeedNewAvatar", 1); - PROTO_AVATAR_INFORMATIONT AI = { sizeof(AI) }; + PROTO_AVATAR_INFORMATION AI = { sizeof(AI) }; AI.hContact = hContact; GetAvatarFileName(AI.hContact, AI.filename, SIZEOF(AI.filename)); AI.format = ProtoGetAvatarFormat(AI.filename); diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 7d0f9a52be..887cafdf8c 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -44,9 +44,9 @@ CVkProto::CVkProto(const char *szModuleName, const TCHAR *ptszUserName) : InitQueue(); CreateProtoService(PS_CREATEACCMGRUI, &CVkProto::SvcCreateAccMgrUI); - CreateProtoService(PS_GETAVATARINFOT, &CVkProto::SvcGetAvatarInfo); + CreateProtoService(PS_GETAVATARINFO, &CVkProto::SvcGetAvatarInfo); CreateProtoService(PS_GETAVATARCAPS, &CVkProto::SvcGetAvatarCaps); - CreateProtoService(PS_GETMYAVATART, &CVkProto::SvcGetMyAvatar); + CreateProtoService(PS_GETMYAVATAR, &CVkProto::SvcGetMyAvatar); CreateProtoService(PS_SET_LISTENINGTO, &CVkProto::SvcSetListeningTo); HookProtoEvent(ME_OPT_INITIALISE, &CVkProto::OnOptionsInit); -- cgit v1.2.3