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
---
 protocols/SkypeWeb/src/skype_events.cpp  | 10 +++++-----
 protocols/SkypeWeb/src/skype_icons.cpp   |  6 +++---
 protocols/SkypeWeb/src/skype_trouter.cpp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'protocols/SkypeWeb/src')

diff --git a/protocols/SkypeWeb/src/skype_events.cpp b/protocols/SkypeWeb/src/skype_events.cpp
index 8f1339f374..38141ca714 100644
--- a/protocols/SkypeWeb/src/skype_events.cpp
+++ b/protocols/SkypeWeb/src/skype_events.cpp
@@ -46,12 +46,12 @@ INT_PTR CSkypeProto::EventGetIcon(WPARAM wParam, LPARAM lParam)
 	case SKYPE_DB_EVENT_TYPE_CALL_INFO:
 	case SKYPE_DB_EVENT_TYPE_INCOMING_CALL:
 	{
-		icon = Skin_GetIconByHandle(GetIconHandle("inc_call"));
+		icon = IcoLib_GetIconByHandle(GetIconHandle("inc_call"));
 		break;
 	}
 	case SKYPE_DB_EVENT_TYPE_ACTION:
 	{
-		icon = Skin_GetIconByHandle(GetIconHandle("me_action"));
+		icon = IcoLib_GetIconByHandle(GetIconHandle("me_action"));
 		break;
 	}
 	default:
@@ -98,7 +98,7 @@ void CSkypeProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Call");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("inc_call"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("inc_call"));
 	ppc.colorBack = RGB(255, 255, 255);
 	ppc.colorText = RGB(0, 0, 0);
 	ppc.iSeconds = 30;
@@ -109,7 +109,7 @@ void CSkypeProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("notify"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("notify"));
 	ppc.colorBack = RGB(255, 255, 255);
 	ppc.colorText = RGB(0, 0, 0);
 	ppc.iSeconds = 5;
@@ -119,7 +119,7 @@ void CSkypeProto::InitPopups()
 	mir_snprintf(name, "%s_%s", m_szModuleName, "Error");
 	ppc.ptszDescription = desc;
 	ppc.pszName = name;
-	ppc.hIcon = Skin_GetIconByHandle(GetIconHandle("error"));
+	ppc.hIcon = IcoLib_GetIconByHandle(GetIconHandle("error"));
 	ppc.colorBack = RGB(255, 255, 255);
 	ppc.colorText = RGB(0, 0, 0);
 	ppc.iSeconds = -1;
diff --git a/protocols/SkypeWeb/src/skype_icons.cpp b/protocols/SkypeWeb/src/skype_icons.cpp
index 7c49c9adad..6dd88d4998 100644
--- a/protocols/SkypeWeb/src/skype_icons.cpp
+++ b/protocols/SkypeWeb/src/skype_icons.cpp
@@ -50,7 +50,7 @@ void CSkypeProto::InitIcons()
 
 		sid.description.t = Icons[i].Description;
 		sid.iDefaultIndex = -Icons[i].IconId;
-		Icons[i].Handle = Skin_AddIcon(&sid);
+		Icons[i].Handle = IcoLib_AddIcon(&sid);
 	}
 
 }
@@ -67,7 +67,7 @@ HANDLE CSkypeProto::GetSkinIconHandle(const char *name)
 {
 	char iconName[100];
 	mir_snprintf(iconName, SIZEOF(iconName), "%s_%s", MODULE, name);
-	HANDLE hIcon = Skin_GetIconHandle(iconName);
+	HANDLE hIcon = IcoLib_GetIconHandle(iconName);
 	if (hIcon == NULL)
 		hIcon = GetIconHandle(name);
 	return hIcon;
@@ -76,5 +76,5 @@ HANDLE CSkypeProto::GetSkinIconHandle(const char *name)
 void CSkypeProto::UninitIcons()
 {
 	for (size_t i = 0; i < SIZEOF(Icons); i++)
-		Skin_RemoveIcon(Icons[i].Name);
+		IcoLib_RemoveIcon(Icons[i].Name);
 }
\ No newline at end of file
diff --git a/protocols/SkypeWeb/src/skype_trouter.cpp b/protocols/SkypeWeb/src/skype_trouter.cpp
index 2e0a6e27b1..72f1ded025 100644
--- a/protocols/SkypeWeb/src/skype_trouter.cpp
+++ b/protocols/SkypeWeb/src/skype_trouter.cpp
@@ -150,7 +150,7 @@ void CSkypeProto::OnTrouterEvent(const JSONNode &body, const JSONNode &)
 				cle.hContact = hContact;
 				cle.hDbEvent = hEvent;
 				cle.lParam = SKYPE_DB_EVENT_TYPE_INCOMING_CALL;
-				cle.hIcon = Skin_GetIconByHandle(GetIconHandle("inc_call"));
+				cle.hIcon = IcoLib_GetIconByHandle(GetIconHandle("inc_call"));
 
 				CMStringA service(FORMAT, "%s/IncomingCallCLE", GetContactProto(hContact));
 				cle.pszService = service.GetBuffer();
-- 
cgit v1.2.3