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/NewsAggregator/Src/Icons.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'plugins/NewsAggregator/Src/Icons.cpp')

diff --git a/plugins/NewsAggregator/Src/Icons.cpp b/plugins/NewsAggregator/Src/Icons.cpp
index 5cd94ff76d..9ba2b0c79b 100644
--- a/plugins/NewsAggregator/Src/Icons.cpp
+++ b/plugins/NewsAggregator/Src/Icons.cpp
@@ -21,7 +21,7 @@ Boston, MA 02111-1307, USA.
 
 struct _tag_iconList
 {
-	TCHAR*  szDescr;
+	char*  szDescr;
 	char*  szName;
 	int    defIconID;
 	HANDLE hIconLibItem;
@@ -29,34 +29,30 @@ struct _tag_iconList
 
 static iconList[] =
 {
-	{	LPGENT("Protocol icon"),	"main",			IDI_ICON		},
-	{	LPGENT("Check All Feeds"),	"checkall",		IDI_CHECKALL	},
-	{	LPGENT("Add Feed"),			"addfeed",		IDI_ADDFEED		},
-	{	LPGENT("Import Feeds"),		"importfeeds",	IDI_IMPORTFEEDS	},
-	{	LPGENT("Export Feeds"),		"exportfeeds",	IDI_EXPORTFEEDS	},
-	{	LPGENT("Check Feed"),		"checkfeed",	IDI_CHECKALL	},
+	{	LPGEN("Protocol icon"),   "main",        IDI_ICON        },
+	{	LPGEN("Check All Feeds"), "checkall",    IDI_CHECKALL    },
+	{	LPGEN("Add Feed"),        "addfeed",     IDI_ADDFEED     },
+	{	LPGEN("Import Feeds"),    "importfeeds", IDI_IMPORTFEEDS },
+	{	LPGEN("Export Feeds"),    "exportfeeds", IDI_EXPORTFEEDS },
+	{	LPGEN("Check Feed"),      "checkfeed",   IDI_CHECKALL    }
 };
 
 VOID InitIcons()
 {
-	TCHAR szFile[MAX_PATH];
 	char szSettingName[100];
-	SKINICONDESC sid = {0};
-	unsigned i;
-
+	TCHAR szFile[MAX_PATH];
 	GetModuleFileName(hInst, szFile, MAX_PATH);
 
-	sid.cbSize = sizeof(SKINICONDESC);
+	SKINICONDESC sid = { sizeof(sid) };
 	sid.flags = SIDF_ALL_TCHAR;
 	sid.ptszDefaultFile = szFile;
 	sid.pszName = szSettingName;
 	sid.ptszSection = _T("News Aggregator");
 
-	for (i = 0; i < SIZEOF(iconList); i++) 
-	{
+	for (int i = 0; i < SIZEOF(iconList); i++) {
 		mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", MODULE, iconList[i].szName);
 
-		sid.ptszDescription = iconList[i].szDescr;
+		sid.pszDescription = iconList[i].szDescr;
 		sid.iDefaultIndex = -iconList[i].defIconID;
 		iconList[i].hIconLibItem = Skin_AddIcon(&sid);
 	}	
-- 
cgit v1.2.3