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

2 files changed, 7 insertions, 7 deletions

diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp
index c72a50072d..d94e1cf2c1 100644
--- a/protocols/SkypeWeb/src/skype_avatars.cpp
+++ b/protocols/SkypeWeb/src/skype_avatars.cpp
@@ -47,7 +47,7 @@ void CSkypeProto::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);

 }

@@ -60,7 +60,7 @@ void CSkypeProto::OnReceiveAvatar(const NETLIBHTTPREQUEST *response, void *arg)
 	if (response->resultCode != 200)

 		return;

 

-	PROTO_AVATAR_INFORMATIONT AI = { sizeof(AI) };

+	PROTO_AVATAR_INFORMATION AI = { sizeof(AI) };

 	AI.format = ProtoGetBufferFormat(response->pData);

 	setByte(hContact, "AvatarType", AI.format);

 	GetAvatarFileName(hContact, AI.filename, SIZEOF(AI.filename));

@@ -89,7 +89,7 @@ void CSkypeProto::OnSentAvatar(const NETLIBHTTPREQUEST *response)
 

 INT_PTR CSkypeProto::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)

@@ -152,7 +152,7 @@ void CSkypeProto::SetAvatarUrl(MCONTACT hContact, CMString &tszUrl)
 	else {

 		setTString(hContact, "AvatarUrl", tszUrl.GetBuffer());

 		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/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 5241fb00ea..656360a366 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -34,10 +34,10 @@ PROTO<CSkypeProto>(protoName, userName), password(NULL)
 

 	CreateProtoService(PS_CREATEACCMGRUI, &CSkypeProto::OnAccountManagerInit);

 

-	CreateProtoService(PS_GETAVATARINFOT, &CSkypeProto::SvcGetAvatarInfo);

+	CreateProtoService(PS_GETAVATARINFO, &CSkypeProto::SvcGetAvatarInfo);

 	CreateProtoService(PS_GETAVATARCAPS, &CSkypeProto::SvcGetAvatarCaps);

-	CreateProtoService(PS_GETMYAVATART, &CSkypeProto::SvcGetMyAvatar);

-	CreateProtoService(PS_SETMYAVATART, &CSkypeProto::SvcSetMyAvatar);

+	CreateProtoService(PS_GETMYAVATAR, &CSkypeProto::SvcGetMyAvatar);

+	CreateProtoService(PS_SETMYAVATAR, &CSkypeProto::SvcSetMyAvatar);

 

 	CreateProtoService("/IncomingCallCLE", &CSkypeProto::OnIncomingCallCLE);

 	CreateProtoService("/IncomingCallPP", &CSkypeProto::OnIncomingCallPP);