From 57abc51aad272a656282a52a460a47abe24e07d6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 20 Jun 2012 23:51:53 +0000
Subject: - MS_SKIN2_ADDICON replaced with Skin_AddIcon; - SKINICONDESC_SIZE*
 constants removed and replaced with sizeof(sid); - added SIDF_PATH_UNICODE
 for all plugins; - dynamic translation fixed in the icolib options dialog

git-svn-id: http://svn.miranda-ng.org/main/trunk@507 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_mw/clui.cpp | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'plugins/Clist_mw')

diff --git a/plugins/Clist_mw/clui.cpp b/plugins/Clist_mw/clui.cpp
index 14079c2ac6..bddf0478e0 100644
--- a/plugins/Clist_mw/clui.cpp
+++ b/plugins/Clist_mw/clui.cpp
@@ -201,33 +201,27 @@ HICON LoadIconFromExternalFile(char *filename,int i,boolean UseLibrary,boolean r
 		_snprintf(szFullPath, SIZEOF(szFullPath), "%s\\Icons\\%s,%d", szPath, filename, i);
 	}
 
-	if (!UseLibrary||!ServiceExists(MS_SKIN2_ADDICON))
-	{		
+	if (!UseLibrary) {		
 		hIcon = ExtractIconFromPath(szFullPath);
 		if (hIcon) return hIcon;
 	}
-	else
-	{
-		if (registerit&&IconName != NULL&&SectName != NULL)	
-		{
+	else {
+		if (registerit && IconName != NULL && SectName != NULL) {
 			sid.cbSize = sizeof(sid);
 			sid.pszSection = SectName;
 			sid.pszName = IconName;
 			sid.pszDescription = Description;
 			if (strlen(szMyPath) != 0)
-			{
 				sid.pszDefaultFile = szMyPath;
-			}
 
 			sid.iDefaultIndex = internalidx;
 			sid.hDefaultIcon = DefIcon;
 
-			CallService(MS_SKIN2_ADDICON, 0, (LPARAM)&sid);
-			{
-				char buf[256];
-				sprintf(buf,"Registring Icon %s/%s hDefaultIcon: %p\r\n",SectName,IconName,DefIcon);
-				OutputDebugStringA(buf);
-			}
+			Skin_AddIcon(&sid);
+			
+			char buf[256];
+			sprintf(buf,"Registring Icon %s/%s hDefaultIcon: %p\r\n",SectName,IconName,DefIcon);
+			OutputDebugStringA(buf);
 		}
 		return ((HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)IconName));
 	}
-- 
cgit v1.2.3