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

3 files changed, 6 insertions, 9 deletions

diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp
index 63ecec27ec..4236da9d89 100644
--- a/protocols/MRA/src/MraAvatars.cpp
+++ b/protocols/MRA/src/MraAvatars.cpp
@@ -87,8 +87,7 @@ void CMraProto::MraAvatarsQueueClear(HANDLE hAvatarsQueueHandle)
 	MRA_AVATARS_QUEUE *pmraaqAvatarsQueue = (MRA_AVATARS_QUEUE*)hAvatarsQueueHandle;

 	MRA_AVATARS_QUEUE_ITEM *pmraaqiAvatarsQueueItem;

 

-	PROTO_AVATAR_INFORMATIONT pai = { 0 };

-	pai.cbSize = sizeof(pai);

+	PROTO_AVATAR_INFORMATION pai = { 0 };

 	pai.format = PA_FORMAT_UNKNOWN;

 

 	while (FifoMTItemPop(pmraaqAvatarsQueue, NULL, (LPVOID*)&pmraaqiAvatarsQueueItem) == NO_ERROR) {

@@ -156,11 +155,9 @@ void CMraProto::MraAvatarsThreadProc(LPVOID lpParameter)
 	HANDLE hConnection = NULL;

 	NETLIBSELECT nls = { 0 };

 	INTERNET_TIME itAvatarLastModifiedTimeServer;

-	PROTO_AVATAR_INFORMATIONT pai;

 	WCHAR szErrorText[2048];

 

 	nls.cbSize = sizeof(nls);

-	pai.cbSize = sizeof(pai);

 

 	HANDLE hThreadEvent = CreateEvent(NULL, FALSE, FALSE, NULL);

 	{

@@ -305,6 +302,7 @@ void CMraProto::MraAvatarsThreadProc(LPVOID lpParameter)
 			}

 		}

 

+		PROTO_AVATAR_INFORMATION pai;

 		if (bFailed) {

 			DeleteFile(wszFileName);

 			pai.hContact = pmraaqiAvatarsQueueItem->hContact;

@@ -553,8 +551,7 @@ DWORD CMraProto::MraAvatarsQueueGetAvatarSimple(HANDLE hAvatarsQueueHandle, DWOR
 	if ( !hAvatarsQueueHandle)

 		return GAIR_NOAVATAR;

 

-	PROTO_AVATAR_INFORMATIONT pai = { 0 };

-	pai.cbSize = sizeof(pai);

+	PROTO_AVATAR_INFORMATION pai = { 0 };

 	pai.hContact = hContact;

 	DWORD dwRetCode = MraAvatarsQueueGetAvatar(hAvatarsQueueHandle, dwFlags, hContact, NULL, (DWORD*)&pai.format, pai.filename);

 	if (dwRetCode != GAIR_SUCCESS)

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 74d587d25a..702d23e347 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -25,8 +25,8 @@ CMraProto::CMraProto(const char* _module, const TCHAR* _displayName) :
 

 	CreateProtoService(PS_CREATEACCMGRUI, &CMraProto::MraCreateAccMgrUI);

 	CreateProtoService(PS_GETAVATARCAPS, &CMraProto::MraGetAvatarCaps);

-	CreateProtoService(PS_GETAVATARINFOT, &CMraProto::MraGetAvatarInfo);

-	CreateProtoService(PS_GETMYAVATART, &CMraProto::MraGetMyAvatar);

+	CreateProtoService(PS_GETAVATARINFO, &CMraProto::MraGetAvatarInfo);

+	CreateProtoService(PS_GETMYAVATAR, &CMraProto::MraGetMyAvatar);

 

 	CreateProtoService(MS_ICQ_SENDSMS, &CMraProto::MraSendSMS);

 	CreateProtoService(PS_SEND_NUDGE, &CMraProto::MraSendNudge);

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index 3d0ca4267f..abf84e465a 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -614,7 +614,7 @@ INT_PTR CMraProto::MraGetAvatarCaps(WPARAM wParam, LPARAM)
 INT_PTR CMraProto::MraGetAvatarInfo(WPARAM wParam, LPARAM lParam)

 {

 	if (lParam) {

-		PROTO_AVATAR_INFORMATIONT *ppai = (PROTO_AVATAR_INFORMATIONT*)lParam;

+		PROTO_AVATAR_INFORMATION *ppai = (PROTO_AVATAR_INFORMATION*)lParam;

 		return (INT_PTR)MraAvatarsQueueGetAvatar(hAvatarsQueueHandle, (DWORD)wParam, ppai->hContact, NULL, (DWORD*)&ppai->format, ppai->filename);

 	}

 	return GAIR_NOAVATAR;