MS_SKIN_LOADICON & MS_SKIN_LOADPROTOICON replaced with direct function calls

git-svn-id: http://svn.miranda-ng.org/main/trunk@14176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

20 files changed, 42 insertions, 42 deletions

diff --git a/src/core/stdauth/src/auth.cpp b/src/core/stdauth/src/auth.cpp
index 3a1a1d43eb..e2a4148e67 100644
--- a/src/core/stdauth/src/auth.cpp
+++ b/src/core/stdauth/src/auth.cpp
@@ -92,7 +92,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam)
 		else

 			mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u requests authorization"), *(PDWORD)dbei.pBlob);

 

-		cli.hIcon = LoadSkinIcon(SKINICON_AUTH_REQUEST);

+		cli.hIcon = Skin_LoadIcon(SKINICON_AUTH_REQUEST);

 		cli.pszService = MS_AUTH_SHOWREQUEST;

 		CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cli);

 	}

@@ -103,7 +103,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam)
 		else

 			mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u added you to their contact list"), *(PDWORD)dbei.pBlob);

 

-		cli.hIcon = LoadSkinIcon(SKINICON_AUTH_ADD);

+		cli.hIcon = Skin_LoadIcon(SKINICON_AUTH_ADD);

 		cli.pszService = MS_AUTH_SHOWADDED;

 		CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cli);

 	}

diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp
index 80f775ff8f..7cee287dd1 100644
--- a/src/core/stdaway/src/awaymsg.cpp
+++ b/src/core/stdaway/src/awaymsg.cpp
@@ -148,7 +148,7 @@ static int AwayMsgPreBuildMenu(WPARAM hContact, LPARAM)
 			if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGRECV) {

 				if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(status)) {

 					mi.flags = CMIM_FLAGS | CMIM_NAME | CMIF_NOTOFFLINE | CMIM_ICON | CMIF_TCHAR;

-					mi.hIcon = LoadSkinProtoIcon(szProto, status);

+					mi.hIcon = Skin_LoadProtoIcon(szProto, status);

 				}

 			}

 		}

diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index 5f5246dde4..1347036dd4 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -445,7 +445,7 @@ static INT_PTR CALLBACK DlgProcAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam
 			}

 

 			RECT rc = dis->rcItem;

-			DrawIconEx(dis->hDC, 3, (rc.top + rc.bottom - 16) / 2, LoadSkinnedProtoIcon(NULL, dis->itemData), 16, 16, 0, NULL, DI_NORMAL);

+			DrawIconEx(dis->hDC, 3, (rc.top + rc.bottom - 16) / 2, Skin_LoadProtoIcon(NULL, dis->itemData), 16, 16, 0, NULL, DI_NORMAL);

 			rc.left += 25;

 			SetBkMode(dis->hDC, TRANSPARENT);

 			DrawText(dis->hDC, buf, -1, &rc, DT_LEFT | DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX);

diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp
index 48b31036a2..0528908ae0 100644
--- a/src/core/stdchat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -79,12 +79,12 @@ int OnShutdown(WPARAM, LPARAM)
 

 static void OnCreateModule(MODULEINFO *mi)

 {

-	mi->OnlineIconIndex = ImageList_AddIcon(hIconsList, LoadSkinnedProtoIcon(mi->pszModule, ID_STATUS_ONLINE));

+	mi->OnlineIconIndex = ImageList_AddIcon(hIconsList, Skin_LoadProtoIcon(mi->pszModule, ID_STATUS_ONLINE));

 	mi->hOnlineIcon = ImageList_GetIcon(hIconsList, mi->OnlineIconIndex, ILD_TRANSPARENT);

 	mi->hOnlineTalkIcon = ImageList_GetIcon(hIconsList, mi->OnlineIconIndex, ILD_TRANSPARENT | INDEXTOOVERLAYMASK(1));

 	ImageList_AddIcon(hIconsList, mi->hOnlineTalkIcon);

 

-	mi->OfflineIconIndex = ImageList_AddIcon(hIconsList, LoadSkinnedProtoIcon(mi->pszModule, ID_STATUS_OFFLINE));

+	mi->OfflineIconIndex = ImageList_AddIcon(hIconsList, Skin_LoadProtoIcon(mi->pszModule, ID_STATUS_OFFLINE));

 	mi->hOfflineIcon = ImageList_GetIcon(hIconsList, mi->OfflineIconIndex, ILD_TRANSPARENT);

 	mi->hOfflineTalkIcon = ImageList_GetIcon(hIconsList, mi->OfflineIconIndex, ILD_TRANSPARENT | INDEXTOOVERLAYMASK(1));

 	ImageList_AddIcon(hIconsList, mi->hOfflineTalkIcon);

@@ -398,7 +398,7 @@ extern "C" __declspec(dllexport) int Unload(void)
 void LoadIcons(void)

 {

 	hIconsList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 0, 100);

-	ImageList_AddIcon(hIconsList, LoadSkinnedIcon(SKINICON_EVENT_MESSAGE));

+	ImageList_AddIcon(hIconsList, Skin_LoadIcon(SKINICON_EVENT_MESSAGE));

 	ImageList_AddIcon(hIconsList, LoadIconEx("overlay", FALSE));

 	ImageList_SetOverlayImage(hIconsList, 1, 1);

 }

diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index a710d2be23..3e8edd8030 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1835,14 +1835,14 @@ END_REMOVETAB:
 						FillRect(dis->hDC, &dis->rcItem, pci->hListBkgBrush);

 

 					if (g_Settings.bShowContactStatus && g_Settings.bContactStatusFirst && ui->ContactStatus) {

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

+						HICON hIcon = Skin_LoadProtoIcon(si->pszModule, ui->ContactStatus);

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

 						x_offset += 18;

 					}

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

 					x_offset += 12;

 					if (g_Settings.bShowContactStatus && !g_Settings.bContactStatusFirst && ui->ContactStatus) {

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

+						HICON hIcon = Skin_LoadProtoIcon(si->pszModule, ui->ContactStatus);

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

 						x_offset += 18;

 					}

diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index bbd013a7af..3312357c5b 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -449,7 +449,7 @@ int ClcModernOptInit(WPARAM wParam, LPARAM lParam)
 

 	obj.cbSize = sizeof(obj);

 	obj.dwFlags = MODEROPT_FLG_TCHAR;

-	obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+	obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	obj.hInstance = g_hInst;

 	obj.iSection = MODERNOPT_PAGE_SKINS;

 	obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;

diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index c39709e9ee..aad1364110 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -259,7 +259,7 @@ int CListModernOptInit(WPARAM wParam, LPARAM lParam)
 	MODERNOPTOBJECT obj = { 0 };

 	obj.cbSize = sizeof(obj);

 	obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;

-	obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+	obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	obj.hInstance = g_hInst;

 	obj.iSection = MODERNOPT_PAGE_CLIST;

 	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index 50b947abf1..af5fe02bee 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -350,7 +350,7 @@ int CluiModernOptInit(WPARAM wParam, LPARAM lParam)
 

 	obj.cbSize = sizeof(obj);

 	obj.dwFlags = MODEROPT_FLG_TCHAR|MODEROPT_FLG_NORESIZE;

-	obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

+	obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

 	obj.hInstance = g_hInst;

 	obj.iSection = MODERNOPT_PAGE_CLIST;

 	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

diff --git a/src/core/stdemail/src/email.cpp b/src/core/stdemail/src/email.cpp
index fa025cfd1b..270e818e1b 100644
--- a/src/core/stdemail/src/email.cpp
+++ b/src/core/stdemail/src/email.cpp
@@ -68,7 +68,7 @@ int LoadSendRecvEMailModule(void)
 {

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = -2000010000;

-	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_SENDEMAIL);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_SENDEMAIL);

 	mi.pszName = LPGEN("&E-mail");

 	mi.pszService = MS_EMAIL_SENDEMAIL;

 	hEMailMenuItem = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stdfile/src/file.cpp b/src/core/stdfile/src/file.cpp
index 58db4a89e9..d6a28d2072 100644
--- a/src/core/stdfile/src/file.cpp
+++ b/src/core/stdfile/src/file.cpp
@@ -127,7 +127,7 @@ void PushFileEvent(MCONTACT hContact, MEVENT hdbe, LPARAM lParam)
 		cle.ptszTooltip = szTooltip;

 

 		cle.flags |= CLEF_TCHAR;

-		cle.hIcon = LoadSkinIcon(SKINICON_EVENT_FILE);

+		cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_FILE);

 		cle.pszService = "SRFile/RecvFile";

 		CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);

 	}

@@ -338,7 +338,7 @@ static int SRFileModulesLoaded(WPARAM, LPARAM)
 {

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = -2000020000;

-	mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_FILE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

 	mi.pszName = LPGEN("&File");

 	mi.pszService = MS_FILE_SENDFILE;

 	hSRFileMenuItem = Menu_AddContactMenuItem(&mi);

@@ -435,7 +435,7 @@ int LoadSendRecvFileModule(void)
 	CreateServiceFunction("FtMgr/Show", FtMgrShowCommand);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_FILE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_FILE);

 	mi.position = 1900000000;

 	mi.pszName = LPGEN("File &transfers...");

 	mi.pszService = "FtMgr/Show"; //MS_PROTO_SHOWFTMGR;

diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index 137f80f23b..ac01125118 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -154,7 +154,7 @@ static void SetFilenameControls(HWND hwndDlg, FileDlgData *dat, PROTOFILETRANSFE
 	}
 	else {
 		mir_tstrncpy(msg, pcli->pfnGetContactDisplayName(fts->hContact, 0), SIZEOF(msg));
-		HICON hIcon = LoadSkinIcon(SKINICON_OTHER_DOWNARROW);
+		HICON hIcon = Skin_LoadIcon(SKINICON_OTHER_DOWNARROW);
 		dat->hIcon = CopyIcon(hIcon);
 		IcoLib_ReleaseIcon(hIcon, NULL);
 	}
@@ -274,7 +274,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		{
 			char *szProto = GetContactProto(dat->hContact);
 			WORD status = db_get_w(dat->hContact, szProto, "Status", ID_STATUS_ONLINE);
-			SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinnedProtoIcon(szProto, status));
+			SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_LoadProtoIcon(szProto, status));
 		}
 
 		SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Contact menu"), 0);
diff --git a/src/core/stdhelp/src/help.cpp b/src/core/stdhelp/src/help.cpp
index 81281c6888..af276a413d 100644
--- a/src/core/stdhelp/src/help.cpp
+++ b/src/core/stdhelp/src/help.cpp
@@ -74,7 +74,7 @@ int LoadHelpModule(void)
 	CreateServiceFunction("Help/BugCommand", BugCommand);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

-	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_MIRANDA);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDA);

 	mi.pszPopupName = LPGEN("&Help");

 	mi.popupPosition = 2000090000;

 	mi.position = 2000090000;

@@ -82,19 +82,19 @@ int LoadHelpModule(void)
 	mi.pszService = "Help/AboutCommand";

 	Menu_AddMainMenuItem(&mi);

 

-	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_HELP);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HELP);

 	mi.position = -500050000;

 	mi.pszName = LPGEN("&Support");

 	mi.pszService = "Help/IndexCommand";

 	Menu_AddMainMenuItem(&mi);

 

-	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_MIRANDAWEB);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_MIRANDAWEB);

 	mi.position = 2000050000;

 	mi.pszName = LPGEN("&Miranda NG homepage");

 	mi.pszService = "Help/WebsiteCommand";

 	Menu_AddMainMenuItem(&mi);

 

-	mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_URL);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	mi.position = 2000040000;

 	mi.pszName = LPGEN("&Report bug");

 	mi.pszService = "Help/BugCommand";

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index fe5f689eb2..775a202f20 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -912,13 +912,13 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 			if (dat->szProto) {

 				WORD wStatus = db_get_w(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);

-				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedProtoIconBig(dat->szProto, wStatus));

-				SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadSkinnedProtoIcon(dat->szProto, wStatus));

+				SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadProtoIcon(dat->szProto, wStatus, true));

+				SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_LoadProtoIcon(dat->szProto, wStatus));

 				break;

 			}

 		}

-		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)LoadSkinnedIconBig(SKINICON_EVENT_MESSAGE));

-		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)LoadSkinnedIcon(SKINICON_EVENT_MESSAGE));

+		SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)Skin_LoadIcon(SKINICON_EVENT_MESSAGE, true));

+		SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)Skin_LoadIcon(SKINICON_EVENT_MESSAGE));

 		break;

 

 	case DM_USERNAMETOCLIP:

@@ -1304,7 +1304,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (dat->nTypeSecs) {

 					TCHAR szBuf[256];

 					TCHAR* szContactName = pcli->pfnGetContactDisplayName(dat->hContact, 0);

-					HICON hTyping = LoadSkinnedIcon(SKINICON_OTHER_TYPING);

+					HICON hTyping = Skin_LoadIcon(SKINICON_OTHER_TYPING);

 

 					mir_sntprintf(szBuf, SIZEOF(szBuf), TranslateT("%s is typing a message..."), szContactName);

 					dat->nTypeSecs--;

@@ -1342,7 +1342,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			if (dis->CtlID == IDC_PROTOCOL) {

 				if (dat->szProto) {

 					int dwStatus = db_get_w(dat->hContact, dat->szProto, "Status", ID_STATUS_OFFLINE);

-					HICON hIcon = LoadSkinnedProtoIcon(dat->szProto, dwStatus);

+					HICON hIcon = Skin_LoadProtoIcon(dat->szProto, dwStatus);

 					if (hIcon) {

 						if (db_get_dw(dat->hContact, dat->szProto, "IdleTS", 0)) {

 							HIMAGELIST hImageList = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 1, 0);

diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index d2a22249e3..a5d8c93c2a 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -589,7 +589,7 @@ static int ModernOptInitialise(WPARAM wParam, LPARAM lParam)
 

 	MODERNOPTOBJECT obj = { sizeof(obj) };

 	obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;

-	obj.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

+	obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 	obj.hInstance = g_hInst;

 	obj.iSection = MODERNOPT_PAGE_MSGS;

 	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index b152ed7bb7..9d8a6befd8 100644
--- a/src/core/stdmsg/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
@@ -91,7 +91,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam)
 	cle.hContact = hContact;

 	cle.hDbEvent = lParam;

 	cle.flags = CLEF_TCHAR;

-	cle.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

+	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 	cle.pszService = "SRMsg/ReadMessage";

 	TCHAR toolTip[256];

 	mir_sntprintf(toolTip, SIZEOF(toolTip), TranslateT("Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

@@ -181,7 +181,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 			cle.hContact = hContact;

 			cle.hDbEvent = 1;

 			cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;

-			cle.hIcon = LoadSkinnedIcon(SKINICON_OTHER_TYPING);

+			cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_TYPING);

 			cle.pszService = "SRMsg/ReadMessage";

 			cle.ptszTooltip = szTip;

 			CallServiceSync(MS_CLIST_REMOVEEVENT, hContact, 1);

@@ -227,7 +227,7 @@ static void RestoreUnreadMessageAlerts(void)
 	TCHAR toolTip[256];

 

 	CLISTEVENT cle = { sizeof(cle) };

-	cle.hIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);

+	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);

 	cle.pszService = "SRMsg/ReadMessage";

 	cle.flags = CLEF_TCHAR;

 	cle.ptszTooltip = toolTip;

@@ -281,7 +281,7 @@ static int SplitmsgModulesLoaded(WPARAM, LPARAM)
 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = -2000090000;

 	mi.flags = CMIF_DEFAULT;

-	mi.icolibItem = LoadSkinnedIconHandle(SKINICON_EVENT_MESSAGE);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_MESSAGE);

 	mi.pszName = LPGEN("&Message");

 	mi.pszService = MS_MSG_SENDMESSAGE;

 	hMsgMenuItem = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp
index 8f38b2d02f..0297875807 100644
--- a/src/core/stduihist/src/history.cpp
+++ b/src/core/stduihist/src/history.cpp
@@ -412,7 +412,7 @@ int LoadHistoryModule(void)
 {

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = 1000090000;

-	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_HISTORY);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_HISTORY);

 	mi.pszName = LPGEN("View &history");

 	mi.pszService = MS_HISTORY_SHOWCONTACTHISTORY;

 	hContactMenu = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index 5c1b3c50b3..1dfdfa894b 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -55,7 +55,7 @@ static int UrlEventAdded(WPARAM hContact, LPARAM lParam)
 	cle.flags = CLEF_TCHAR;

 	cle.hContact = hContact;

 	cle.hDbEvent = lParam;

-	cle.hIcon = LoadSkinIcon(SKINICON_EVENT_URL);

+	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_URL);

 	cle.pszService = "SRUrl/ReadUrl";

 	cle.ptszTooltip = szTooltip;

 	CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);

@@ -71,7 +71,7 @@ static INT_PTR SendUrlCommand(WPARAM wParam, LPARAM)
 static void RestoreUnreadUrlAlerts(void)

 {

 	CLISTEVENT cle = { sizeof(cle) };

-	cle.hIcon = LoadSkinIcon(SKINICON_EVENT_URL);

+	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_URL);

 	cle.pszService = "SRUrl/ReadUrl";

 	cle.flags = CLEF_TCHAR;

 

@@ -121,7 +121,7 @@ static int SRUrlModulesLoaded(WPARAM, LPARAM)
 {

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = -2000040000;

-	mi.icolibItem = GetSkinIconHandle(SKINICON_EVENT_URL);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_EVENT_URL);

 	mi.pszName = LPGEN("Web page address (&URL)");

 	mi.pszService = MS_URL_SENDURL;

 	hSRUrlMenuItem = Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stduserinfo/src/contactinfo.cpp b/src/core/stduserinfo/src/contactinfo.cpp
index b06a8c795d..7636f6b231 100644
--- a/src/core/stduserinfo/src/contactinfo.cpp
+++ b/src/core/stduserinfo/src/contactinfo.cpp
@@ -411,15 +411,15 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 							HICON hIcon = NULL;

 							if (nm->nmcd.lItemlParam == -2 && nm->iSubItem-3 == (nm->nmcd.hdr.idFrom == IDC_PHONES))

-								hIcon = LoadSkinIcon(SKINICON_OTHER_ADDCONTACT);

+								hIcon = Skin_LoadIcon(SKINICON_OTHER_ADDCONTACT);

 							else if (nm->iSubItem>1 && nm->nmcd.lItemlParam != -1 && nm->nmcd.lItemlParam != -2) {

 								static int iconResources[3] = {SKINICON_OTHER_RENAME, SKINICON_OTHER_DELETE};

 								if (nm->iSubItem == 2 && nm->nmcd.hdr.idFrom == IDC_PHONES) {

 									TCHAR szText[2];

 									ListView_GetItemText(nm->nmcd.hdr.hwndFrom, nm->nmcd.dwItemSpec, nm->iSubItem, szText, SIZEOF(szText));

-									if (szText[0]) hIcon = LoadSkinIcon(SKINICON_OTHER_SMS);

+									if (szText[0]) hIcon = Skin_LoadIcon(SKINICON_OTHER_SMS);

 								}

-								else hIcon = LoadSkinIcon(iconResources[nm->iSubItem-3+(nm->nmcd.hdr.idFrom == IDC_EMAILS)]);

+								else hIcon = Skin_LoadIcon(iconResources[nm->iSubItem-3+(nm->nmcd.hdr.idFrom == IDC_EMAILS)]);

 							}

 							else break;

 							DrawIconEx(nm->nmcd.hdc, (rc.left+rc.right-GetSystemMetrics(SM_CXSMICON))/2, (rc.top+rc.bottom-GetSystemMetrics(SM_CYSMICON))/2, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL);

diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index db234f29cb..b195b5bb05 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -630,7 +630,7 @@ int LoadUserInfoModule(void)
 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = 1000050000;

-	mi.icolibItem = GetSkinIconHandle(SKINICON_OTHER_USERDETAILS);

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_USERDETAILS);

 	mi.pszName = LPGEN("User &details");

 	mi.pszService = MS_USERINFO_SHOWDIALOG;

 	Menu_AddContactMenuItem(&mi);

diff --git a/src/core/stduseronline/src/useronline.cpp b/src/core/stduseronline/src/useronline.cpp
index ece6fa3028..e2cb2cc85b 100644
--- a/src/core/stduseronline/src/useronline.cpp
+++ b/src/core/stduseronline/src/useronline.cpp
@@ -65,7 +65,7 @@ static int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam)
 				cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;

 				cle.hContact = hContact;

 				cle.hDbEvent = uniqueEventId++;

-				cle.hIcon = LoadSkinIcon(SKINICON_OTHER_USERONLINE, false);

+				cle.hIcon = Skin_LoadIcon(SKINICON_OTHER_USERONLINE, false);

 				cle.pszService = "UserOnline/Description";

 				mir_sntprintf(tooltip, SIZEOF(tooltip), TranslateT("%s is online"), pcli->pfnGetContactDisplayName(hContact, 0));

 				cle.ptszTooltip = tooltip;