From 75b1ff75c42644eb36552762652e4b0c9ff071bc Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 2 Nov 2012 14:11:01 +0000
Subject: final switch to the typed icolib api

git-svn-id: http://svn.miranda-ng.org/main/trunk@2152 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Nudge/src/main.cpp    | 5 ++---
 plugins/Nudge/src/options.cpp | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'plugins/Nudge/src')

diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index 932e462333..268c589587 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -558,7 +558,7 @@ void LoadPopupClass()
 		ppc.flags = PCF_TCHAR;
 		ppc.pszName = "Nudge";
 		ppc.ptszDescription = LPGENT("Show Nudge");
-		ppc.hIcon = (HICON) CallService(MS_SKIN2_GETICONBYHANDLE,0,(LPARAM)g_hIcon);
+		ppc.hIcon = Skin_GetIconByHandle(g_hIcon);
 		ppc.colorBack = NULL;
 		ppc.colorText = NULL;
 		ppc.iSeconds = 0;
@@ -628,9 +628,8 @@ void Nudge_ShowPopup(CNudgeElement n, HANDLE hContact, TCHAR * Message)
 	else if(ServiceExists(MS_POPUP_ADDPOPUPT))
 	{
 		POPUPDATAT NudgePopUp = {0};
-
 		NudgePopUp.lchContact = hContact;
-		NudgePopUp.lchIcon = (HICON) CallService(MS_SKIN2_GETICON,0,(LPARAM) n.hIcoLibItem );
+		NudgePopUp.lchIcon = Skin_GetIconByHandle(n.hIcoLibItem);
 		NudgePopUp.colorBack = 0;
 		NudgePopUp.colorText = 0;
 		NudgePopUp.iSeconds = 0;
diff --git a/plugins/Nudge/src/options.cpp b/plugins/Nudge/src/options.cpp
index 2d299f1290..306e79e6f1 100644
--- a/plugins/Nudge/src/options.cpp
+++ b/plugins/Nudge/src/options.cpp
@@ -124,9 +124,7 @@ void CreateImageList(HWND hWnd)
 	{
 		INT_PTR res = CallProtoService(n->item.ProtocolName, PS_LOADICON,PLI_PROTOCOL | PLIF_SMALL | PLIF_ICOLIB, 0);
 		if(res==CALLSERVICE_NOTFOUND)
-		{
-			res = CallService(MS_SKIN2_GETICONBYHANDLE,0,(LPARAM)n->item.hIcoLibItem);
-		}
+			res = (INT_PTR)Skin_GetIconByHandle(n->item.hIcoLibItem);
 
 		HICON hIcon = (HICON) res;
 		ImageList_AddIcon(hImList, hIcon);
-- 
cgit v1.2.3