From 04ac06b7119933997ee0b407478d4cb409007098 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 18 Jan 2014 09:34:05 +0000
Subject: end of crazy matrix mechanics in chat's icon ordering

git-svn-id: http://svn.miranda-ng.org/main/trunk@7708 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/chat/manager.cpp | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src/modules/chat/manager.cpp')

diff --git a/src/modules/chat/manager.cpp b/src/modules/chat/manager.cpp
index 6c7b1c6afa..d418b56a24 100644
--- a/src/modules/chat/manager.cpp
+++ b/src/modules/chat/manager.cpp
@@ -226,22 +226,10 @@ static HICON SM_GetStatusIcon(SESSION_INFO *si, USERINFO * ui)
 
 	STATUSINFO *ti = ci.TM_FindStatus(si->pStatuses, ci.TM_WordToString(si->pStatuses, ui->Status));
 	if (ti != NULL) {
-		if ((INT_PTR)ti->hIcon >= STATUSICONCOUNT)
+		if ((UINT_PTR)ti->hIcon >= STATUSICONCOUNT)
 			return ti->hIcon;
 
-		int id = si->iStatusCount - (int)ti->hIcon - 1;
-		if (id == 0)
-			return ci.hIcons[ICON_STATUS0];
-		if (id == 1)
-			return ci.hIcons[ICON_STATUS1];
-		if (id == 2)
-			return ci.hIcons[ICON_STATUS2];
-		if (id == 3)
-			return ci.hIcons[ICON_STATUS3];
-		if (id == 4)
-			return ci.hIcons[ICON_STATUS4];
-		if (id == 5)
-			return ci.hIcons[ICON_STATUS5];
+		return ci.hIcons[ICON_STATUS0 + (int)ti->hIcon];
 	}
 	return ci.hIcons[ICON_STATUS0];
 }
@@ -898,7 +886,7 @@ static void MM_FontsChanged(void)
 {
 	MODULEINFO *pTemp = m_ModList;
 	while (pTemp != NULL) {
-		pTemp->pszHeader = Log_CreateRtfHeader(pTemp);
+		pTemp->pszHeader = ci.Log_CreateRtfHeader(pTemp);
 		pTemp = pTemp->next;
 	}
 	return;
-- 
cgit v1.2.3