- 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, 16 insertions, 16 deletions

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 638c8feb85..60a5bf88c8 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1402,7 +1402,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 					if (g_Settings.bShowContactStatus && g_Settings.bContactStatusFirst && ui->ContactStatus) {

 						hIcon = LoadSkinnedProtoIcon(si->pszModule, ui->ContactStatus);

 						DrawIconEx(dis->hDC, x_offset, dis->rcItem.top + offset - 3, hIcon, 16, 16, 0, NULL, DI_NORMAL);

-						Skin_ReleaseIcon(hIcon);

+						IcoLib_ReleaseIcon(hIcon);

 						x_offset += 18;

 					}

 					DrawIconEx(dis->hDC, x_offset, dis->rcItem.top + offset, pci->SM_GetStatusIcon(si, ui), 10, 10, 0, NULL, DI_NORMAL);

@@ -1410,7 +1410,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 					if (g_Settings.bShowContactStatus && !g_Settings.bContactStatusFirst && ui->ContactStatus) {

 						hIcon = LoadSkinnedProtoIcon(si->pszModule, ui->ContactStatus);

 						DrawIconEx(dis->hDC, x_offset, dis->rcItem.top + offset - 3, hIcon, 16, 16, 0, NULL, DI_NORMAL);

-						Skin_ReleaseIcon(hIcon);

+						IcoLib_ReleaseIcon(hIcon);

 						x_offset += 18;

 					}

 

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 8a35da30a5..dde38e5739 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -176,14 +176,14 @@ int ImageList_AddIcon_Ex(HIMAGELIST hIml, int id)
 {

 	HICON hIcon = LoadSkinnedIcon(id);

 	int res = ImageList_AddIcon(hIml, hIcon);

-	Skin_ReleaseIcon(hIcon);

+	IcoLib_ReleaseIcon(hIcon);

 	return res;

 }

 

 int ImageList_AddIcon_Ex2(HIMAGELIST hIml, HICON hIcon)

 {

 	int res = ImageList_AddIcon(hIml, hIcon);

-	Skin_ReleaseIcon(hIcon);

+	IcoLib_ReleaseIcon(hIcon);

 	return res;

 }

 

@@ -191,7 +191,7 @@ int ImageList_ReplaceIcon_Ex(HIMAGELIST hIml, int nIndex, int id)
 {

 	HICON hIcon = LoadSkinnedIcon(id);

 	int res = ImageList_ReplaceIcon(hIml, nIndex, hIcon);

-	Skin_ReleaseIcon(hIcon);

+	IcoLib_ReleaseIcon(hIcon);

 	return res;

 }

 

@@ -199,22 +199,22 @@ int ImageList_AddIcon_ProtoEx(HIMAGELIST hIml, const char* szProto, int status)
 {

 	HICON hIcon = LoadSkinnedProtoIcon(szProto, status);

 	int res = ImageList_AddIcon(hIml, hIcon);

-	Skin_ReleaseIcon(hIcon);

+	IcoLib_ReleaseIcon(hIcon);

 	return res;

 }

 

 void ReleaseIcons()

 {

-	Skin_ReleaseIcon(g_dat.hMsgIcon);

-	Skin_ReleaseIcon(g_dat.hMsgIconBig);

-	Skin_ReleaseIcon(g_dat.hIconChatBig);

+	IcoLib_ReleaseIcon(g_dat.hMsgIcon);

+	IcoLib_ReleaseIcon(g_dat.hMsgIconBig);

+	IcoLib_ReleaseIcon(g_dat.hIconChatBig);

 }

 

 HICON GetCachedIcon(const char *name)

 {

 	for (int i = 0; i < SIZEOF(iconList); i++)

 	if (!mir_strcmp(iconList[i].szName, name))

-		return Skin_GetIconByHandle(iconList[i].hIcolib);

+		return IcoLib_GetIconByHandle(iconList[i].hIcolib);

 

 	return NULL;

 }

@@ -225,7 +225,7 @@ void LoadGlobalIcons()
 

 	g_dat.hMsgIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

 	g_dat.hMsgIconBig = LoadSkinnedIconBig(SKINICON_EVENT_MESSAGE);

-	g_dat.hIconChatBig = Skin_GetIcon("chat_window", true);

+	g_dat.hIconChatBig = IcoLib_GetIcon("chat_window", true);

 

 	ImageList_RemoveAll(g_dat.hButtonIconList);

 	ImageList_RemoveAll(g_dat.hChatButtonIconList);

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 5fd420c57b..6c93ab2243 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -223,10 +223,10 @@ void SetStatusIcon(SrmmWindowData *dat)
 		hContact = dat->hContact;

 	char *szProto = GetContactProto(hContact);

 

-	Skin_ReleaseIcon(dat->statusIcon);

+	IcoLib_ReleaseIcon(dat->statusIcon);

 	dat->statusIcon = LoadSkinnedProtoIcon(szProto, dat->wStatus);

 

-	Skin_ReleaseIcon(dat->statusIconBig);

+	IcoLib_ReleaseIcon(dat->statusIconBig);

 	dat->statusIconBig = LoadSkinnedProtoIconBig(szProto, dat->wStatus);

 	if ((int)dat->statusIconBig == CALLSERVICE_NOTFOUND)

 		dat->statusIconBig = NULL;

@@ -1844,8 +1844,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 		if (dat->nTypeMode == PROTOTYPE_SELFTYPING_ON)

 			NotifyTyping(dat, PROTOTYPE_SELFTYPING_OFF);

 

-		Skin_ReleaseIcon(dat->statusIcon);

-		Skin_ReleaseIcon(dat->statusIconBig);

+		IcoLib_ReleaseIcon(dat->statusIcon);

+		IcoLib_ReleaseIcon(dat->statusIconBig);

 		if (dat->statusIconOverlay != NULL) DestroyIcon(dat->statusIconOverlay);

 		dat->statusIcon = NULL;

 		dat->statusIconOverlay = NULL;

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 572bcedf47..e4d025badb 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -454,7 +454,7 @@ static int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 	mi.pszName = LPGEN("&Message");

 	mi.pszService = MS_MSG_SENDMESSAGE;

 	hMsgMenuItem = Menu_AddContactMenuItem(&mi);

-	Skin_ReleaseIcon(mi.hIcon);

+	IcoLib_ReleaseIcon(mi.hIcon);

 

 	HookEvent(ME_SMILEYADD_OPTIONSCHANGED, SmileySettingsChanged);

 	HookEvent(ME_IEVIEW_OPTIONSCHANGED, SmileySettingsChanged);