From 02ed4455c23e3562d71bfc80a0e2c4fede8708f1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 14 Jun 2015 13:17:26 +0000
Subject: - all icolib services removed; - IcoLib_* functions are bound
 directly to the code

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

(limited to 'plugins/YAPP/src')

diff --git a/plugins/YAPP/src/popwin.cpp b/plugins/YAPP/src/popwin.cpp
index 78e2607abe..ac801b8ef4 100644
--- a/plugins/YAPP/src/popwin.cpp
+++ b/plugins/YAPP/src/popwin.cpp
@@ -736,14 +736,14 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 void PopupData::SetIcon(HICON hNewIcon)
 {
 	if (flags & PDF_ICOLIB) {
-		Skin_ReleaseIcon(hIcon);
+		IcoLib_ReleaseIcon(hIcon);
 		flags &= ~PDF_ICOLIB;
 	}
 
 	hIcon = hNewIcon;
 
-	if ( CallService(MS_SKIN2_ISMANAGEDICON, (WPARAM)hIcon, 0)) {
-		CallService(MS_SKIN2_ADDREFICON, (WPARAM)hIcon, 0);
+	if (IcoLib_IsManaged(hIcon)) {
+		IcoLib_AddRef(hIcon);
 		flags |= PDF_ICOLIB;
 	}
 }
diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp
index a499976d91..35c7a61640 100644
--- a/plugins/YAPP/src/yapp.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -96,8 +96,8 @@ int TTBLoaded(WPARAM, LPARAM)
 	if (db_get_b(0, "Popup", "ModuleIsEnabled", 1))
 		ttb.dwFlags |= TTBBF_PUSHED;
 	ttb.name = LPGEN("Toggle Popups");
-	ttb.hIconHandleUp = Skin_GetIconHandle(ICO_TB_POPUP_OFF);
-	ttb.hIconHandleDn = Skin_GetIconHandle(ICO_TB_POPUP_ON);
+	ttb.hIconHandleUp = IcoLib_GetIconHandle(ICO_TB_POPUP_OFF);
+	ttb.hIconHandleDn = IcoLib_GetIconHandle(ICO_TB_POPUP_ON);
 	ttb.pszTooltipUp = LPGEN("Enable Popups");
 	ttb.pszTooltipDn = LPGEN("Disable Popups");
 	hTTButton = TopToolbar_AddButton(&ttb);
-- 
cgit v1.2.3