From 8eaea03b376ddda81c6f31c2cb1d46963b16d8a2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 20 Jun 2012 07:18:21 +0000
Subject: total replacement of PROTO_AVATAR_INFORMATION with
 PROTO_AVATAR_INFORMATIONT

git-svn-id: http://svn.miranda-ng.org/main/trunk@496 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/FlashAvatars/cflash.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/FlashAvatars')

diff --git a/plugins/FlashAvatars/cflash.cpp b/plugins/FlashAvatars/cflash.cpp
index a6fb4e7d32..1e3ec2d9c1 100644
--- a/plugins/FlashAvatars/cflash.cpp
+++ b/plugins/FlashAvatars/cflash.cpp
@@ -329,7 +329,7 @@ static INT_PTR makeAvatar(WPARAM wParam, LPARAM)
 	debug("Searching for flash avatar...\n");
 	FLASHAVATAR* hFA = (FLASHAVATAR*)wParam;
 
-	PROTO_AVATAR_INFORMATION AI = {0};
+	PROTO_AVATAR_INFORMATIONT AI = {0};
 	AI.cbSize = sizeof(AI);
 	AI.hContact = hFA->hContact;
 	AI.format = PA_FORMAT_UNKNOWN;
@@ -337,13 +337,13 @@ static INT_PTR makeAvatar(WPARAM wParam, LPARAM)
 	flash_avatar_item key(hFA->hContact, *hFA, NULL);
 
 	bool avatarOK = false;
-	if(hFA->hContact) {
-		avatarOK = (int)CallProtoService(key.getProto(), PS_GETAVATARINFO, 0, (LPARAM)&AI) == GAIR_SUCCESS;
-	} else {
-		avatarOK = (int)CallProtoService(key.getProto(), PS_GETMYAVATAR, (WPARAM)AI.filename, (LPARAM)255) == 0;
+	if(hFA->hContact)
+		avatarOK = (int)CallProtoService(key.getProto(), PS_GETAVATARINFOT, 0, (LPARAM)&AI) == GAIR_SUCCESS;
+	else {
+		avatarOK = (int)CallProtoService(key.getProto(), PS_GETMYAVATART, (WPARAM)AI.filename, (LPARAM)255) == 0;
 		if(avatarOK) {
-			char* ext = strrchr(AI.filename, '.');
-			if(ext && (_stricmp(ext, ".xml") == 0))
+			TCHAR* ext = _tcsrchr(AI.filename, _T('.'));
+			if(ext && (_tcsicmp(ext, _T(".xml")) == 0))
 				AI.format = PA_FORMAT_XML;
 		}
 	}
@@ -351,13 +351,13 @@ static INT_PTR makeAvatar(WPARAM wParam, LPARAM)
 	if (!avatarOK) return 0;
 	debug("Avatar found...\n");
 
-	char* url = NULL;
+	TCHAR* url = NULL;
 	switch(AI.format) {
 		case PA_FORMAT_SWF:
 			url = AI.filename;
 			break;
 		case PA_FORMAT_XML: {
-			int src = _open(AI.filename, _O_BINARY | _O_RDONLY);
+			int src = _tfopen(AI.filename, _O_BINARY | _O_RDONLY);
 			if(src != -1) {
 				char pBuf[2048];
 				char* urlBuf;
-- 
cgit v1.2.3