- 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

4 files changed, 13 insertions, 13 deletions

diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp
index 150b22e5d4..6c951d2cd7 100644
--- a/protocols/JabberG/src/jabber_frame.cpp
+++ b/protocols/JabberG/src/jabber_frame.cpp
@@ -360,7 +360,7 @@ void CJabberInfoFrame::PaintCompact(HDC hdc)
 

 		if (depth == 0) {

 			if (item.m_hIcolibIcon) {

-				HICON hIcon = Skin_GetIconByHandle(item.m_hIcolibIcon);

+				HICON hIcon = IcoLib_GetIconByHandle(item.m_hIcolibIcon);

 				if (hIcon) {

 					DrawIconEx(hdc, SZ_FRAMEPADDING, (rc.bottom-cy_icon)/2, hIcon, cx_icon, cy_icon, 0, NULL, DI_NORMAL);

 					g_ReleaseIcon(hIcon);

@@ -372,7 +372,7 @@ void CJabberInfoFrame::PaintCompact(HDC hdc)
 		}

 		else {

 			if (item.m_hIcolibIcon) {

-				HICON hIcon = Skin_GetIconByHandle(item.m_hIcolibIcon);

+				HICON hIcon = IcoLib_GetIconByHandle(item.m_hIcolibIcon);

 				if (hIcon) {

 					SetRect(&item.m_rcItem, cx, (rc.bottom-cy_icon)/2, cx+cx_icon, (rc.bottom-cy_icon)/2+cy_icon);

 					DrawIconEx(hdc, cx, (rc.bottom-cy_icon)/2, hIcon, cx_icon, cy_icon, 0, NULL, DI_NORMAL);

@@ -418,7 +418,7 @@ void CJabberInfoFrame::PaintNormal(HDC hdc)
 		SetRect(&item.m_rcItem, cx, cy, rc.right - SZ_FRAMEPADDING, cy + line_height);

 

 		if (item.m_hIcolibIcon) {

-			HICON hIcon = Skin_GetIconByHandle(item.m_hIcolibIcon);

+			HICON hIcon = IcoLib_GetIconByHandle(item.m_hIcolibIcon);

 			if (hIcon) {

 				DrawIconEx(hdc, cx, cy + (line_height-cy_icon)/2, hIcon, cx_icon, cy_icon, 0, NULL, DI_NORMAL);

 				cx += cx_icon + SZ_ICONSPACING;

diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 6ce5f2385c..22e03e489f 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -94,7 +94,7 @@ CIconPool::CPoolItem::CPoolItem():
 CIconPool::CPoolItem::~CPoolItem()

 {

 	if (m_hIcolibItem && m_szIcolibName) {

-		CallService(MS_SKIN2_REMOVEICON, 0, (LPARAM)m_szIcolibName);

+		IcoLib_RemoveIcon(m_szIcolibName);

 		mir_free(m_szIcolibName);

 	}

 

@@ -126,7 +126,7 @@ void CIconPool::RegisterIcon(const char *name, TCHAR *filename, int iconid, TCHA
 	sid.description.t = szDescription;

 	sid.flags = SIDF_ALL_TCHAR;

 	sid.iDefaultIndex = iconid;

-	item->m_hIcolibItem = Skin_AddIcon(&sid);

+	item->m_hIcolibItem = IcoLib_AddIcon(&sid);

 

 	m_items.insert(item);

 }

@@ -150,7 +150,7 @@ char *CIconPool::GetIcolibName(const char *name)
 HICON CIconPool::GetIcon(const char *name, bool big)

 {

 	if (CPoolItem *item = FindItemByName(name))

-		return Skin_GetIconByHandle(item->m_hIcolibItem, big);

+		return IcoLib_GetIconByHandle(item->m_hIcolibItem, big);

 

 	return NULL;

 }

@@ -186,7 +186,7 @@ HICON CJabberProto::LoadIconEx(const char* name, bool big)
 		return result;

 

 	if (!mir_strcmp(name, "main"))

-		return Skin_GetIconByHandle(m_hProtoIcon, big);

+		return IcoLib_GetIconByHandle(m_hProtoIcon, big);

 

 	return NULL;

 }

@@ -292,9 +292,9 @@ static HICON LoadTransportIcon(char *filename,int i,char *IconName,TCHAR *SectNa
 		sid.defaultFile.a = szMyPath;

 		sid.iDefaultIndex = i;

 		sid.flags = SIDF_TCHAR;

-		Skin_AddIcon(&sid);

+		IcoLib_AddIcon(&sid);

 	}

-	return Skin_GetIcon(IconName);

+	return IcoLib_GetIcon(IconName);

 }

 

 static HICON LoadSmallIcon(HINSTANCE hInstance, LPCTSTR lpIconName)

@@ -558,13 +558,13 @@ HICON g_LoadIconEx(const char* name, bool big)
 {

 	char szSettingName[100];

 	mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GLOBAL_SETTING_PREFIX, name);

-	return Skin_GetIcon(szSettingName, big);

+	return IcoLib_GetIcon(szSettingName, big);

 }

 

 void g_ReleaseIcon(HICON hIcon)

 {

 	if (hIcon)

-		Skin_ReleaseIcon(hIcon);

+		IcoLib_ReleaseIcon(hIcon);

 }

 

 void ImageList_AddIcon_Icolib(HIMAGELIST hIml, HICON hIcon)

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index a51eefa6a2..4fe5a32f0c 100644
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -477,7 +477,7 @@ void CJabberProto::InitPopups(void)
 	ppc.iSeconds = 60;

 	m_hPopupClass = Popup_RegisterClass(&ppc);

 

-	Skin_ReleaseIcon(ppc.hIcon);

+	IcoLib_ReleaseIcon(ppc.hIcon);

 }

 

 void CJabberProto::MsgPopup(MCONTACT hContact, const TCHAR *szMsg, const TCHAR *szTitle)

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 7ac15547a1..9c09e5a415 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -323,7 +323,7 @@ static void sttFillAdvStatusInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM ht
 			mir_sntprintf(szText, _T("%s (%s)"), TranslateTS(szAdvStatusTitle), szAdvStatusText);
 		else
 			_tcsncpy_s(szText, TranslateTS(szAdvStatusTitle), _TRUNCATE);
-		sttFillInfoLine(hwndTree, htiRoot, Skin_GetIcon(szAdvStatusIcon), szTitle, szText, dwInfoLine);
+		sttFillInfoLine(hwndTree, htiRoot, IcoLib_GetIcon(szAdvStatusIcon), szTitle, szText, dwInfoLine);
 	}
 
 	mir_free(szAdvStatusIcon);