From 78f4e3d07a8d405e642bec6a40e74d57fe9073c6 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 12 Apr 2017 13:12:29 +0300
Subject: fix for a tab icon for message sessions

---
 src/core/stdmsg/src/chat_manager.cpp | 2 ++
 src/core/stdmsg/src/stdafx.h         | 1 +
 src/core/stdmsg/src/tabs.cpp         | 2 ++
 3 files changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index 4ae765f651..119914b7c2 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -87,6 +87,8 @@ static void OnCreateModule(MODULEINFO *mi)
 	mi->hOfflineIcon = ImageList_GetIcon(hIconsList, mi->OfflineIconIndex, ILD_TRANSPARENT);
 	mi->hOfflineTalkIcon = ImageList_GetIcon(hIconsList, mi->OfflineIconIndex, ILD_TRANSPARENT | INDEXTOOVERLAYMASK(1));
 	ImageList_AddIcon(hIconsList, mi->hOfflineTalkIcon);
+
+	g_iMessageIconIndex = ImageList_AddIcon(hIconsList, Skin_LoadIcon(SKINICON_EVENT_MESSAGE));
 }
 
 static void OnReplaceSession(SESSION_INFO *si)
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 820fc8d910..c3e8cdabd8 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -114,6 +114,7 @@ extern HIMAGELIST hIconsList;
 
 extern HINSTANCE g_hInst;
 extern BOOL SmileyAddInstalled, PopupInstalled;
+extern int g_iMessageIconIndex;
 
 // main.cpp
 void LoadIcons(void);
diff --git a/src/core/stdmsg/src/tabs.cpp b/src/core/stdmsg/src/tabs.cpp
index a3f9ed91d8..4826653607 100644
--- a/src/core/stdmsg/src/tabs.cpp
+++ b/src/core/stdmsg/src/tabs.cpp
@@ -41,6 +41,7 @@ void TB_SaveSession(SESSION_INFO *si)
 }
 
 CTabbedWindow *pDialog = nullptr;
+int g_iMessageIconIndex;
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -197,6 +198,7 @@ void CTabbedWindow::FixTabIcons(CSrmmBaseDialog *pDlg)
 					image++;
 			}
 		}
+		else image = g_iMessageIconIndex;
 
 		TCITEM tci = {};
 		tci.mask = TCIF_IMAGE;
-- 
cgit v1.2.3