From 1860018b201d995ed051c0affb72d5a1d09fa02e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 1 Dec 2012 20:32:13 +0000
Subject: SKINICONDESC initialization - end of story

git-svn-id: http://svn.miranda-ng.org/main/trunk@2598 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/YAMN/src/main.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'plugins/YAMN/src')

diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index 866fdfbd2c..b935f2134f 100644
--- a/plugins/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
@@ -243,7 +243,7 @@ int SystemModulesLoaded(WPARAM, LPARAM)
 
 struct TIconListItem
 {
-	TCHAR*  szDescr;
+	char*  szDescr;
 	char*  szName;
 	int    defIconID;
 	HANDLE hIcon;
@@ -252,10 +252,10 @@ struct TIconListItem
 static TIconListItem iconList[] =
 {
 
-	{LPGENT("Check mail"),			"YAMN_Check",		IDI_CHECKMAIL,	0},
-	{LPGENT("Launch application"),	"YAMN_Launch",		IDI_LAUNCHAPP,	0},
-	{LPGENT("New Mail"),			"YAMN_NewMail",		IDI_NEWMAIL,	0},
-	{LPGENT("Connect Fail"),		"YAMN_ConnectFail",	IDI_BADCONNECT,	0},
+	{ LPGEN("Check mail"),         "YAMN_Check",       IDI_CHECKMAIL,  0 },
+	{ LPGEN("Launch application"), "YAMN_Launch",      IDI_LAUNCHAPP,  0 },
+	{ LPGEN("New Mail"),           "YAMN_NewMail",     IDI_NEWMAIL,    0 },
+	{ LPGEN("Connect Fail"),       "YAMN_ConnectFail", IDI_BADCONNECT, 0 },
 };
 
 static void LoadIcons()
@@ -263,16 +263,14 @@ static void LoadIcons()
 	TCHAR szFile[MAX_PATH];
 	GetModuleFileName(YAMNVar.hInst, szFile, MAX_PATH);
 
-	SKINICONDESC sid = {0};
-	sid.cbSize = sizeof(SKINICONDESC);
-	sid.flags = SIDF_ALL_TCHAR;
+	SKINICONDESC sid = { sizeof(sid) };
+	sid.flags = SIDF_PATH_TCHAR;
 	sid.ptszDefaultFile = szFile;
-	sid.ptszSection = _T("YAMN");
+	sid.pszSection = "YAMN";
 
-	for (int i = 0, k = 0; i < SIZEOF(iconList); i++)
-	{
+	for (int i = 0, k = 0; i < SIZEOF(iconList); i++) {
 		sid.pszName = iconList[i].szName;
-		sid.ptszDescription = iconList[i].szDescr;
+		sid.pszDescription = iconList[i].szDescr;
 		sid.iDefaultIndex = -iconList[i].defIconID;
 		iconList[i].hIcon = Skin_AddIcon(&sid);
 	}
-- 
cgit v1.2.3