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, 8 deletions

diff --git a/protocols/AimOscar/src/avatars.cpp b/protocols/AimOscar/src/avatars.cpp
index 0ecf63cb42..2a961d7cd6 100644
--- a/protocols/AimOscar/src/avatars.cpp
+++ b/protocols/AimOscar/src/avatars.cpp
@@ -98,9 +98,7 @@ void CAimProto::avatar_request_handler(MCONTACT hContact, char* hash, unsigned c
 void CAimProto::avatar_retrieval_handler(const char* sn, const char* /*hash*/, const char* data, int data_len)

 {

 	bool res = false;

-	PROTO_AVATAR_INFORMATIONT AI = {0};

-	AI.cbSize = sizeof(AI);

-

+	PROTO_AVATAR_INFORMATION AI = {0};

 	AI.hContact = contact_from_sn(sn);

 

 	if (data_len > 0) {

diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp
index e12ed362b1..5a8ac4f8e8 100644
--- a/protocols/AimOscar/src/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
@@ -32,9 +32,9 @@ CAimProto::CAimProto(const char* aProtoName, const TCHAR* aUserName) :
 

 	CreateProtoService(PS_GETMYAWAYMSG,   &CAimProto::GetMyAwayMsg);

 

-	CreateProtoService(PS_GETAVATARINFOT, &CAimProto::GetAvatarInfo);

-	CreateProtoService(PS_GETMYAVATART,   &CAimProto::GetAvatar);

-	CreateProtoService(PS_SETMYAVATART,   &CAimProto::SetAvatar);

+	CreateProtoService(PS_GETAVATARINFO, &CAimProto::GetAvatarInfo);

+	CreateProtoService(PS_GETMYAVATAR,   &CAimProto::GetAvatar);

+	CreateProtoService(PS_SETMYAVATAR,   &CAimProto::SetAvatar);

 	CreateProtoService(PS_GETAVATARCAPS,  &CAimProto::GetAvatarCaps);

 

 	CreateProtoService(PS_JOINCHAT,       &CAimProto::OnJoinChat);

diff --git a/protocols/AimOscar/src/services.cpp b/protocols/AimOscar/src/services.cpp
index 01944ef024..6e35b76a1f 100644
--- a/protocols/AimOscar/src/services.cpp
+++ b/protocols/AimOscar/src/services.cpp
@@ -339,7 +339,7 @@ INT_PTR CAimProto::ManageAccount(WPARAM, LPARAM)
 

 INT_PTR CAimProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)

 {

-	PROTO_AVATAR_INFORMATIONT* AI = (PROTO_AVATAR_INFORMATIONT*)lParam;

+	PROTO_AVATAR_INFORMATION* AI = (PROTO_AVATAR_INFORMATION*)lParam;

 	

 	AI->filename[0] = 0;

 	AI->format = PA_FORMAT_UNKNOWN;

@@ -410,7 +410,7 @@ INT_PTR CAimProto::GetAvatar(WPARAM wParam, LPARAM lParam)
 	if (buf == NULL || size <= 0)

 		return -1;

 

-	PROTO_AVATAR_INFORMATIONT ai = { sizeof(ai) };

+	PROTO_AVATAR_INFORMATION ai = { sizeof(ai) };

 	if (GetAvatarInfo(0, (LPARAM)&ai) == GAIR_SUCCESS)

 	{

 		_tcsncpy(buf, ai.filename, size);