From acd4daf132c8ff3b05df7615e95f60be2fb82ddb Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 1 Jun 2015 20:40:05 +0000 Subject: various quirks with PROTO_AVATAR_INFORMATION declarations git-svn-id: http://svn.miranda-ng.org/main/trunk@13965 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/src/main.cpp | 4 ++-- plugins/AVS/src/poll.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/AVS/src') diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index a7e7e97d06..93a2d008e8 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -87,10 +87,10 @@ static int ProtocolAck(WPARAM, LPARAM lParam) if (ack->hProcess == NULL) ProcessAvatarInfo(ack->hContact, GAIR_NOAVATAR, NULL, ack->szModule); else - ProcessAvatarInfo(ack->hContact, GAIR_SUCCESS, (PROTO_AVATAR_INFORMATION *)ack->hProcess, ack->szModule); + ProcessAvatarInfo(ack->hContact, GAIR_SUCCESS, (PROTO_AVATAR_INFORMATION*)ack->hProcess, ack->szModule); } else if (ack->result == ACKRESULT_FAILED) { - ProcessAvatarInfo(ack->hContact, GAIR_FAILED, (PROTO_AVATAR_INFORMATION *)ack->hProcess, ack->szModule); + ProcessAvatarInfo(ack->hContact, GAIR_FAILED, (PROTO_AVATAR_INFORMATION*)ack->hProcess, ack->szModule); } else if (ack->result == ACKRESULT_STATUS) { char *szProto = GetContactProto(ack->hContact); diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp index a0d92ebc98..f0e237bfef 100644 --- a/plugins/AVS/src/poll.cpp +++ b/plugins/AVS/src/poll.cpp @@ -204,12 +204,12 @@ int FetchAvatarFor(MCONTACT hContact, char *szProto) if ((g_AvatarHistoryAvail && CallService(MS_AVATARHISTORY_ENABLED, hContact, 0)) || (PollCheckProtocol(szProto) && PollCheckContact(hContact))) { // Request it - PROTO_AVATAR_INFORMATION pai_s = { 0 }; - pai_s.hContact = hContact; - INT_PTR res = CallProtoService(szProto, PS_GETAVATARINFO, GAIF_FORCE, (LPARAM)&pai_s); + PROTO_AVATAR_INFORMATION ai = { 0 }; + ai.hContact = hContact; + INT_PTR res = CallProtoService(szProto, PS_GETAVATARINFO, GAIF_FORCE, (LPARAM)&ai); if (res != CALLSERVICE_NOTFOUND) result = res; - ProcessAvatarInfo(pai_s.hContact, result, &pai_s, szProto); + ProcessAvatarInfo(ai.hContact, result, &ai, szProto); } } -- cgit v1.2.3