From 5e49edfe66308d79bd8095acb1c89d0e987c7aa4 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 6 Sep 2016 16:51:39 +0000
Subject: Clist_GetImageList()

git-svn-id: http://svn.miranda-ng.org/main/trunk@17266 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/core/stdclist/src/init.cpp | 4 ++--
 src/mir_app/src/clistmod.cpp   | 5 ++---
 src/mir_app/src/mir_app.def    | 1 +
 src/mir_app/src/mir_app64.def  | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index 8c3a6d471d..2373ac2c35 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -84,7 +84,7 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_CLIST,
 
 static int OnAccountsChanged(WPARAM, LPARAM)
 {
-	himlCListClc = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0);
+	himlCListClc = Clist_GetImageList();
 	return 0;
 }
 
@@ -96,7 +96,7 @@ static int OnModulesLoaded(WPARAM, LPARAM)
 {
 	HookEvent(ME_MODERNOPT_INITIALIZE, OnModernOptsInit);
 	RegisterCListFonts();
-	himlCListClc = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0);
+	himlCListClc = Clist_GetImageList();
 	return 0;
 }
 
diff --git a/src/mir_app/src/clistmod.cpp b/src/mir_app/src/clistmod.cpp
index 13f82b29ae..b74a591854 100644
--- a/src/mir_app/src/clistmod.cpp
+++ b/src/mir_app/src/clistmod.cpp
@@ -243,9 +243,9 @@ MIR_APP_DLL(void) Clist_ContactDoubleClicked(MCONTACT hContact)
 	}
 }
 
-static INT_PTR GetIconsImageList(WPARAM, LPARAM)
+MIR_APP_DLL(HIMAGELIST) Clist_GetImageList(void)
 {
-	return (INT_PTR)hCListImages;
+	return hCListImages;
 }
 
 static int CListIconsChanged(WPARAM, LPARAM)
@@ -431,7 +431,6 @@ int LoadContactListModule2(void)
 
 	hCListImages = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, 13, 0);
 	HookEvent(ME_SKIN_ICONSCHANGED, CListIconsChanged);
-	CreateServiceFunction(MS_CLIST_GETICONSIMAGELIST, GetIconsImageList);
 
 	ImageList_AddIcon_NotShared(hCListImages, MAKEINTRESOURCE(IDI_BLANK));
 
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 4f2eee5936..c54c104990 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -271,3 +271,4 @@ Clist_MenuProcessHotkey @270
 Clist_ContactChangeGroup @271
 Clist_ContactCompare @272
 Clist_ContactDoubleClicked @273
+Clist_GetImageList @274
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index a046bfaf97..90a51705a2 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -271,3 +271,4 @@ Clist_MenuProcessHotkey @270
 Clist_ContactChangeGroup @271
 Clist_ContactCompare @272
 Clist_ContactDoubleClicked @273
+Clist_GetImageList @274
-- 
cgit v1.2.3