From 30aa26c864fa09b974e3c223ccf907421ebc0759 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 10 Apr 2018 13:11:16 +0300
Subject: obsolete compatibility code removed from AVS

---
 plugins/Clist_nicer/src/clcitems.cpp | 2 --
 plugins/Clist_nicer/src/clcpaint.cpp | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugins/Clist_nicer/src')

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 82a98901a8..906568a206 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -85,8 +85,6 @@ void LoadAvatarForContact(ClcContact *p)
 	p->ace = nullptr;
 	if (cfg::dat.bAvatarServiceAvail && (p->cFlags & ECF_AVATAR) && (!cfg::dat.bNoOfflineAvatars || p->wStatus != ID_STATUS_OFFLINE)) {
 		p->ace = (struct AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)p->hContact, 0);
-		if (p->ace != nullptr && p->ace->cbSize != sizeof(struct AVATARCACHEENTRY))
-			p->ace = nullptr;
 		if (p->ace != nullptr)
 			p->ace->t_lastAccess = cfg::dat.t_now;
 	}
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp
index 4b37de1d13..6c013e5248 100644
--- a/plugins/Clist_nicer/src/clcpaint.cpp
+++ b/plugins/Clist_nicer/src/clcpaint.cpp
@@ -203,7 +203,7 @@ static int __fastcall DrawAvatar(HDC hdcMem, RECT *rc, ClcContact *contact, int
 	if (!cfg::dat.bAvatarServiceAvail || dat->bisEmbedded)
 		return 0;
 
-	if (contact->ace != nullptr && contact->ace->cbSize == sizeof(struct AVATARCACHEENTRY)) {
+	if (contact->ace != nullptr) {
 		if (contact->ace->dwFlags & AVS_HIDEONCLIST)
 			return (cfg::dat.dwFlags & CLUI_FRAME_ALWAYSALIGNNICK) ? avatar_size + 2 : 0;
 
-- 
cgit v1.2.3