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/JabberG/src/jabber_iqid.cpp  | 3 +--
 protocols/JabberG/src/jabber_proto.cpp | 6 +++---
 protocols/JabberG/src/jabber_svc.cpp   | 2 +-
 protocols/JabberG/src/jabber_util.cpp  | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'protocols/JabberG/src')

diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index dfe3246216..72eb87d11a 100644
--- a/protocols/JabberG/src/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
@@ -1401,8 +1401,7 @@ LBL_ErrFormat:
 	else if ((pictureType = ProtoGetBufferFormat(body, 0)) == PA_FORMAT_UNKNOWN)
 		goto LBL_ErrFormat;
 
-	PROTO_AVATAR_INFORMATIONT AI;
-	AI.cbSize = sizeof AI;
+	PROTO_AVATAR_INFORMATION AI;
 	AI.format = pictureType;
 	AI.hContact = hContact;
 
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index ee87d26b89..5b558257ef 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -82,7 +82,7 @@ CJabberProto::CJabberProto(const char *aProtoName, const TCHAR *aUserName) :
 
 	CreateProtoService(PS_CREATEACCMGRUI, &CJabberProto::SvcCreateAccMgrUI);
 
-	CreateProtoService(PS_GETAVATARINFOT, &CJabberProto::JabberGetAvatarInfo);
+	CreateProtoService(PS_GETAVATARINFO, &CJabberProto::JabberGetAvatarInfo);
 	CreateProtoService(PS_GETMYAWAYMSG, &CJabberProto::GetMyAwayMsg);
 	CreateProtoService(PS_SET_LISTENINGTO, &CJabberProto::OnSetListeningTo);
 
@@ -98,9 +98,9 @@ CJabberProto::CJabberProto(const char *aProtoName, const TCHAR *aUserName) :
 	CreateProtoService(JS_INCOMING_NOTE_EVENT, &CJabberProto::OnIncomingNoteEvent);
 
 	CreateProtoService(JS_SENDXML, &CJabberProto::ServiceSendXML);
-	CreateProtoService(PS_GETMYAVATART, &CJabberProto::JabberGetAvatar);
+	CreateProtoService(PS_GETMYAVATAR, &CJabberProto::JabberGetAvatar);
 	CreateProtoService(PS_GETAVATARCAPS, &CJabberProto::JabberGetAvatarCaps);
-	CreateProtoService(PS_SETMYAVATART, &CJabberProto::JabberSetAvatar);
+	CreateProtoService(PS_SETMYAVATAR, &CJabberProto::JabberSetAvatar);
 	CreateProtoService(PS_SETMYNICKNAME, &CJabberProto::JabberSetNickname);
 
 	CreateProtoService(JS_DB_GETEVENTTEXT_CHATSTATES, &CJabberProto::OnGetEventTextChatStates);
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index b175f9c426..45413a7e89 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -121,7 +121,7 @@ INT_PTR __cdecl CJabberProto::JabberGetAvatarInfo(WPARAM wParam, LPARAM lParam)
 	if (!m_options.EnableAvatars)
 		return GAIR_NOAVATAR;
 
-	PROTO_AVATAR_INFORMATIONT* AI = (PROTO_AVATAR_INFORMATIONT*)lParam;
+	PROTO_AVATAR_INFORMATION* AI = (PROTO_AVATAR_INFORMATION*)lParam;
 
 	ptrA szHashValue( getStringA(AI->hContact, "AvatarHash"));
 	if (szHashValue == NULL) {
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 8017aa59ec..a83d136e8e 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -935,8 +935,7 @@ void __cdecl CJabberProto::LoadHttpAvatars(void* param)
 			if (res->resultCode == 200 && res->dataLength) {
 				int pictureType = ProtoGetBufferFormat(res->pData);
 				if (pictureType != PA_FORMAT_UNKNOWN) {
-					PROTO_AVATAR_INFORMATIONT AI;
-					AI.cbSize = sizeof(AI);
+					PROTO_AVATAR_INFORMATION AI;
 					AI.format = pictureType;
 					AI.hContact = avs[i].hContact;
 
-- 
cgit v1.2.3