1 files changed, 14 insertions, 60 deletions
diff --git a/src/icons.cpp b/src/icons.cpp
index 3f89da2..4d16183 100755
--- a/src/icons.cpp
+++ b/src/icons.cpp
@@ -16,67 +16,34 @@
 
 #include "commonheaders.h"
 
-HANDLE IconLibDefine(TCHAR* desc, TCHAR* section, char* ident, HICON icon, char* def_file, int def_idx, int size)
-{
-  SKINICONDESC sid = {0};
-  HANDLE hIcon;
-
-  if(!size)
-	  size = 16;
-
-  sid.cbSize = sizeof( SKINICONDESC );
-  sid.ptszSection = section;
-  sid.ptszDescription = desc;
-  sid.flags = SIDF_TCHAR;
-
-  sid.pszName = ident;
-  sid.pszDefaultFile = def_file;
-  sid.iDefaultIndex = def_idx;
-  sid.hDefaultIcon = icon;
-  sid.cx = sid.cy = size;
-  
-  hIcon =  Skin_AddIcon(&sid);
-
-  return hIcon;
-}
+extern HINSTANCE hInst;
 
+static IconItem iconList[] =
+{
+	{ "Secured", "secured", IDI_SECURED },
+	{ "Unsecured", "unsecured", IDI_UNSECURED }
+};
 
 void InitIconLib()
 {
-	extern HINSTANCE hInst;
-    char lib[MAX_PATH];
-    GetModuleFileNameA(hInst, lib, MAX_PATH);
-	TCHAR *module = mir_a2t(szGPGModuleName);
-
-	IconLibDefine(_T("Secured"), module, "secured", NULL, lib, -IDI_SECURED,0);
-	IconLibDefine(_T("Unsecured"), module, "unsecured", NULL, lib, -IDI_UNSECURED,0);
-	mir_free(module);
+	Icon_Register(hInst, szGPGModuleName, iconList, SIZEOF(iconList));
 }
 
-
-
-
-
 HICON IconLibGetIcon(const char* ident)
 {
-  return (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)ident);
+	return Skin_GetIcon(ident);
 }
 
-
-
 void IconLibReleaseIcon(const char* ident)
 {
-  CallService(MS_SKIN2_RELEASEICON, 0, (LPARAM)ident);
+	Skin_ReleaseIcon(ident);
 }
 
-
-
 HANDLE IconLibHookIconsChanged(MIRANDAHOOK hook)
 {
-  return HookEvent(ME_SKIN2_ICONSCHANGED, hook);
+	return HookEvent(ME_SKIN2_ICONSCHANGED, hook);
 }
 
-
 void setClistIcon(HANDLE hContact)
 {
 	bool enabled = isContactSecured(hContact);
@@ -86,22 +53,10 @@ void setClistIcon(HANDLE hContact)
 		hMC = metaGetContact(hContact);
 	else if(metaIsProtoMetaContacts(hContact))
 		hMC = metaGetContact(hContact);
-	if(g_hCLIcon && enabled)
-	{
-		HICON icon = IconLibGetIcon("secured");
-		IconExtraColumn iec = {0};
-		iec.cbSize = sizeof(iec);
-		iec.hImage = (HANDLE)CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)icon, (LPARAM)0);
-		ExtraIcon_SetIcon(g_hCLIcon, hContact, iec.hImage);
-		if(hMC)
-			ExtraIcon_SetIcon(g_hCLIcon, hMC, iec.hImage);
-	}
-	else
-	{
-		ExtraIcon_SetIcon(g_hCLIcon, hContact, (HANDLE)0); // is it right ? hmm.., at least working....
-		if(hMC)
-			ExtraIcon_SetIcon(g_hCLIcon, hMC, (HANDLE)0);
-	}
+	const char *szIconId = (enabled) ? "secured" : NULL;
+	ExtraIcon_SetIcon(g_hCLIcon, hContact, szIconId);
+	if(hMC)
+		ExtraIcon_SetIcon(g_hCLIcon, hMC, szIconId);
 }
 
 void setSrmmIcon(HANDLE h)
@@ -139,7 +94,6 @@ void setSrmmIcon(HANDLE h)
 
 void RefreshContactListIcons() 
 {
-	extern HANDLE g_hCLIcon;
 	CallService(MS_CLUI_LISTBEGINREBUILD,0,0);
 	HANDLE hContact = db_find_first();
 	while (hContact)