From 2bb514f4195c99b52e0ec748c975c0fd30dbbd25 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/Steam/src/steam_avatars.cpp | 8 ++++----
protocols/Steam/src/steam_contacts.cpp | 2 +-
protocols/Steam/src/steam_proto.cpp | 4 ++--
protocols/Steam/src/steam_proto.h | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'protocols/Steam/src')
diff --git a/protocols/Steam/src/steam_avatars.cpp b/protocols/Steam/src/steam_avatars.cpp
index 053a526134..7b84a5fe0b 100644
--- a/protocols/Steam/src/steam_avatars.cpp
+++ b/protocols/Steam/src/steam_avatars.cpp
@@ -18,7 +18,7 @@ TCHAR* CSteamProto::GetAvatarFilePath(MCONTACT hContact)
return mir_tstrdup(path);
}
-bool CSteamProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &pai)
+bool CSteamProto::GetDbAvatarInfo(PROTO_AVATAR_INFORMATION &pai)
{
ptrT path(GetAvatarFilePath(pai.hContact));
if (!path)
@@ -44,7 +44,7 @@ void CSteamProto::CheckAvatarChange(MCONTACT hContact, std::string avatarUrl)
if (!hContact)
{
- PROTO_AVATAR_INFORMATIONT pai = { sizeof(pai) };
+ PROTO_AVATAR_INFORMATION pai = { sizeof(pai) };
if (GetAvatarInfo(update_required ? GAIF_FORCE : 0, (LPARAM)&pai) != GAIR_WAITFOR)
CallService(MS_AV_REPORTMYAVATARCHANGED, (WPARAM)m_szModuleName, 0);
}
@@ -60,7 +60,7 @@ INT_PTR CSteamProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)
if (!lParam)
return GAIR_NOAVATAR;
- PROTO_AVATAR_INFORMATIONT* pai = (PROTO_AVATAR_INFORMATIONT*)lParam;
+ PROTO_AVATAR_INFORMATION* pai = (PROTO_AVATAR_INFORMATION*)lParam;
ptrA avatarUrl(getStringA(pai->hContact, "AvatarUrl"));
if (!avatarUrl)
@@ -144,7 +144,7 @@ INT_PTR CSteamProto::GetMyAvatar(WPARAM wParam, LPARAM lParam)
TCHAR* buf = (TCHAR*)wParam;
int size = (int)lParam;
- PROTO_AVATAR_INFORMATIONT ai = { sizeof(ai) };
+ PROTO_AVATAR_INFORMATION ai = { sizeof(ai) };
switch (GetAvatarInfo(0, (LPARAM)&ai)) {
case GAIR_SUCCESS:
_tcsncpy(buf, ai.filename, size);
diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index 85537b886a..fd43933e72 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -520,7 +520,7 @@ void CSteamProto::OnGotUserSummaries(const NETLIBHTTPREQUEST *response)
void CSteamProto::OnGotAvatar(const NETLIBHTTPREQUEST *response, void *arg)
{
- PROTO_AVATAR_INFORMATIONW pai = { sizeof(pai) };
+ PROTO_AVATAR_INFORMATION pai = { sizeof(pai) };
pai.hContact = (MCONTACT)arg;
GetDbAvatarInfo(pai);
diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index 577a896979..1ce64f65de 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -54,9 +54,9 @@ CSteamProto::CSteamProto(const char* protoName, const TCHAR* userName) :
// services
CreateServiceFunction(MODULE"/MenuChoose", CSteamProto::MenuChooseService);
// avatar API
- CreateProtoService(PS_GETAVATARINFOT, &CSteamProto::GetAvatarInfo);
+ CreateProtoService(PS_GETAVATARINFO, &CSteamProto::GetAvatarInfo);
CreateProtoService(PS_GETAVATARCAPS, &CSteamProto::GetAvatarCaps);
- CreateProtoService(PS_GETMYAVATART, &CSteamProto::GetMyAvatar);
+ CreateProtoService(PS_GETMYAVATAR, &CSteamProto::GetMyAvatar);
// custom status API
CreateProtoService(PS_GETCUSTOMSTATUSEX, &CSteamProto::OnGetXStatusEx);
CreateProtoService(PS_GETCUSTOMSTATUSICON, &CSteamProto::OnGetXStatusIcon);
diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index f37a36b20b..fc82986b67 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -206,7 +206,7 @@ protected:
// avatars
TCHAR* GetAvatarFilePath(MCONTACT hContact);
- bool GetDbAvatarInfo(PROTO_AVATAR_INFORMATIONT &pai);
+ bool GetDbAvatarInfo(PROTO_AVATAR_INFORMATION &pai);
void CheckAvatarChange(MCONTACT hContact, std::string avatarUrl);
INT_PTR __cdecl GetAvatarInfo(WPARAM, LPARAM);
--
cgit v1.2.3