From 66ddfd87a0e55b9534b8669392bb0cdee2e9fa3b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 1 Dec 2012 21:07:34 +0000
Subject: SKINICONDESC initialization - end-II :)

git-svn-id: http://svn.miranda-ng.org/main/trunk@2599 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_modern/src/modern_clc.cpp  |  6 ++----
 plugins/Clist_modern/src/modern_clui.cpp | 13 +++++--------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'plugins/Clist_modern/src')

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 054d69648d..598e781c43 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -83,10 +83,8 @@ static int clcHookModulesLoaded(WPARAM wParam,LPARAM lParam)
 	TCHAR szMyPath[MAX_PATH];
 	GetModuleFileName(g_hInst, szMyPath, SIZEOF(szMyPath));
 
-	SKINICONDESC sid = {0};
-	sid.cbSize = sizeof(sid);
-	sid.cx = 16;
-	sid.cy = 16;
+	SKINICONDESC sid = { sizeof(sid) };
+	sid.cx = sid.cy = 16;
 	sid.ptszDefaultFile = szMyPath;
 	sid.flags = SIDF_PATH_TCHAR;
 
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 6892cbf104..b9094b3a25 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -949,7 +949,6 @@ HICON CLUI_LoadIconFromExternalFile(char *filename,int i,BOOL UseLibrary,bool re
 	char szPath[MAX_PATH],szMyPath[MAX_PATH], szFullPath[MAX_PATH],*str;
 	HICON hIcon = NULL;
 	BOOL has_proto_icon = FALSE;
-	SKINICONDESC sid = {0};
 	if (needFree) *needFree = FALSE;
 	GetModuleFileNameA(GetModuleHandle(NULL), szPath, MAX_PATH);
 	GetModuleFileNameA(g_hInst, szMyPath, MAX_PATH);
@@ -977,9 +976,8 @@ HICON CLUI_LoadIconFromExternalFile(char *filename,int i,BOOL UseLibrary,bool re
 	}
 	else {
 		if (registerit && IconName != NULL && SectName != NULL)	{
-			sid.cbSize = sizeof(sid);
-			sid.cx = 16;
-			sid.cy = 16;
+			SKINICONDESC sid = { sizeof(sid) };
+			sid.cx = sid.cy = 16;
 			sid.hDefaultIcon = (has_proto_icon || !(UseLibrary&2))?NULL:(HICON)CallService(MS_SKIN_LOADPROTOICON,0,(LPARAM)(-internalidx));
 			sid.pszSection = SectName;
 			sid.pszName = IconName;
@@ -1672,11 +1670,10 @@ static BOOL FileExists(TCHAR * tszFilename)
 HANDLE RegisterIcolibIconHandle(char * szIcoID, char *szSectionName,  char * szDescription, TCHAR * tszDefaultFile, int iDefaultIndex, HINSTANCE hDefaultModuleInst, int iDefaultResource )
 {
 	TCHAR fileFull[MAX_PATH] = {0};
-	SKINICONDESC sid = {0};
 	HANDLE hIcolibItem = NULL;
-	sid.cbSize = sizeof(sid);
-	sid.cx = 16;
-	sid.cy = 16;
+
+	SKINICONDESC sid = { sizeof(sid) };
+	sid.cx = sid.cy = 16;
 	sid.pszSection = szSectionName;
 	sid.pszName = szIcoID;
 	sid.flags |= SIDF_PATH_TCHAR;
-- 
cgit v1.2.3