From 95aa036670a1ce2c461ffd9bd3a586d191ee4675 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 19 Jul 2012 22:48:01 +0000
Subject: - various icolib fixes; - code cleaning

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

(limited to 'plugins/Chat')

diff --git a/plugins/Chat/src/options.cpp b/plugins/Chat/src/options.cpp
index 381054d5ca..89d39d7f47 100644
--- a/plugins/Chat/src/options.cpp
+++ b/plugins/Chat/src/options.cpp
@@ -429,9 +429,9 @@ void RegisterFonts( void )
 struct
 {
 	int	size;
-	const char* szSection;
-	const char* szDescr;
-	const char* szName;
+	char* szSection;
+	char* szDescr;
+	char* szName;
 	int   defIconID;
 }
 static const iconList[] =
@@ -477,19 +477,19 @@ static const iconList[] =
 
 void AddIcons(void)
 {
-	int i;
-	SKINICONDESC sid = {0};
-	char szFile[MAX_PATH];
-	GetModuleFileNameA(g_hInst, szFile, MAX_PATH);
+	TCHAR szFile[MAX_PATH];
+	GetModuleFileName(g_hInst, szFile, MAX_PATH);
 
+	SKINICONDESC sid = {0};
 	sid.cbSize = sizeof(SKINICONDESC);
-	sid.pszDefaultFile = szFile;
+	sid.ptszDefaultFile = szFile;
+	sid.flags = SIDF_PATH_TCHAR;
 
-	for ( i = 0; i < SIZEOF(iconList); i++ ) {
+	for (int i = 0; i < SIZEOF(iconList); i++ ) {
 		sid.cx = sid.cy = iconList[i].size;
-		sid.pszSection = (char*)iconList[i].szSection;
-		sid.pszDescription = (char*)iconList[i].szDescr;
-		sid.pszName = (char*)iconList[i].szName;
+		sid.pszSection = iconList[i].szSection;
+		sid.pszDescription = iconList[i].szDescr;
+		sid.pszName = iconList[i].szName;
 		sid.iDefaultIndex = -iconList[i].defIconID;
 		Skin_AddIcon(&sid);
 }	}
-- 
cgit v1.2.3