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

5 files changed, 10 insertions, 10 deletions

diff --git a/protocols/MSN/src/msn_avatar.cpp b/protocols/MSN/src/msn_avatar.cpp
index cc0a480418..199de8d362 100644
--- a/protocols/MSN/src/msn_avatar.cpp
+++ b/protocols/MSN/src/msn_avatar.cpp
@@ -76,7 +76,7 @@ LBL_Error:
 	if (fmt == PA_FORMAT_UNKNOWN)

 		goto LBL_Error;

 

-	PROTO_AVATAR_INFORMATIONT AI = { sizeof(AI) };

+	PROTO_AVATAR_INFORMATION AI = { sizeof(AI) };

 	AI.format = fmt;

 	AI.hContact = p->hContact;

 	MSN_GetAvatarFileName(AI.hContact, AI.filename, SIZEOF(AI.filename), szExt);

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index b9136e636e..0d66012e0c 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -1746,7 +1746,7 @@ void CMsnProto::MSN_InitSB(ThreadData* info, const char* szEmail)
 			TranslateT("Chat session established by my request") :

 			TranslateT("Chat session established by contact request"), 0);

 

-	PROTO_AVATAR_INFORMATIONT ai = { sizeof(ai), cont->hContact };

+	PROTO_AVATAR_INFORMATION ai = { sizeof(ai), cont->hContact };

 	GetAvatarInfo(GAIF_FORCE, (LPARAM)&ai);

 }

 

diff --git a/protocols/MSN/src/msn_p2p.cpp b/protocols/MSN/src/msn_p2p.cpp
index 2aa880dd6a..67cb4b9f1a 100644
--- a/protocols/MSN/src/msn_p2p.cpp
+++ b/protocols/MSN/src/msn_p2p.cpp
@@ -194,7 +194,7 @@ void CMsnProto::p2p_pictureTransferFailed(filetransfer* ft)
 	case MSN_APPID_AVATAR:

 	case MSN_APPID_AVATAR2:

 	{

-		PROTO_AVATAR_INFORMATIONT AI = { 0 };

+		PROTO_AVATAR_INFORMATION AI = { 0 };

 		AI.cbSize = sizeof(AI);

 		AI.hContact = ft->std.hContact;

 		delSetting(ft->std.hContact, "AvatarHash");

@@ -233,7 +233,7 @@ void CMsnProto::p2p_savePicture2disk(filetransfer* ft)
 		case MSN_APPID_AVATAR:

 		case MSN_APPID_AVATAR2:

 		{

-			PROTO_AVATAR_INFORMATIONT AI = { 0 };

+			PROTO_AVATAR_INFORMATION AI = { 0 };

 			AI.cbSize = sizeof(AI);

 			AI.format = format;

 			AI.hContact = ft->std.hContact;

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 40be291a48..dce9ae50ff 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -57,13 +57,13 @@ CMsnProto::CMsnProto(const char* aProtoName, const TCHAR* aUserName) :
 

 	CreateProtoService(PS_CREATEACCMGRUI, &CMsnProto::SvcCreateAccMgrUI);

 

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

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

 	CreateProtoService(PS_GETMYAWAYMSG, &CMsnProto::GetMyAwayMsg);

 

 	CreateProtoService(PS_LEAVECHAT, &CMsnProto::OnLeaveChat);

 

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

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

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

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

 	CreateProtoService(PS_GETAVATARCAPS, &CMsnProto::GetAvatarCaps);

 

 	CreateProtoService(PS_SETMYNICKNAME, &CMsnProto::SetNickName);

diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index b758348cdd..88ee42dba8 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -58,12 +58,12 @@ INT_PTR CMsnProto::GetAvatar(WPARAM wParam, LPARAM lParam)
 void CMsnProto::sttFakeAvatarAck(void* arg)

 {

 	Sleep(100);

-	ProtoBroadcastAck(((PROTO_AVATAR_INFORMATIONT*)arg)->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, arg, 0);

+	ProtoBroadcastAck(((PROTO_AVATAR_INFORMATION*)arg)->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, arg, 0);

 }

 

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

 {

-	PROTO_AVATAR_INFORMATIONT *AI = (PROTO_AVATAR_INFORMATIONT*)lParam;

+	PROTO_AVATAR_INFORMATION *AI = (PROTO_AVATAR_INFORMATION*)lParam;

 	TCHAR filename[MAX_PATH];

 	MsnContact *cont = NULL;

 

@@ -125,7 +125,7 @@ INT_PTR CMsnProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)
 		WORD wStatus = getWord(AI->hContact, "Status", ID_STATUS_OFFLINE);

 		if (wStatus == ID_STATUS_OFFLINE) {

 			delSetting(AI->hContact, "AvatarHash");

-			PROTO_AVATAR_INFORMATIONT* fakeAI = new PROTO_AVATAR_INFORMATIONT;

+			PROTO_AVATAR_INFORMATION* fakeAI = new PROTO_AVATAR_INFORMATION;

 			*fakeAI = *AI;

 			ForkThread(&CMsnProto::sttFakeAvatarAck, fakeAI);

 		}