From 30707c980d1560b358dbf2671a4d2a26a1e8173c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 28 Nov 2012 21:45:37 +0000
Subject: various menu initialization quirks

git-svn-id: http://svn.miranda-ng.org/main/trunk@2552 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SimpleStatusMsg/src/awaymsg.cpp | 7 +++----
 plugins/SimpleStatusMsg/src/main.cpp    | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'plugins/SimpleStatusMsg')

diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp
index 6c31c8ec4e..0f50b6d15a 100644
--- a/plugins/SimpleStatusMsg/src/awaymsg.cpp
+++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp
@@ -372,13 +372,13 @@ static INT_PTR GoToURLMsgCommand(WPARAM wParam, LPARAM lParam)
 
 static int AwayMsgPreBuildMenu(WPARAM wParam, LPARAM lParam)
 {
-	CLISTMENUITEM clmi = {0};
 	TCHAR str[128];
 	char *szProto = GetContactProto((HANDLE)wParam);
 	int iHidden = szProto ? DBGetContactSettingByte((HANDLE)wParam, szProto, "ChatRoom", 0) : 0;
 	char *szMsg;
 	int iStatus;
 
+	CLISTMENUITEM clmi = { sizeof(clmi) };
 	clmi.cbSize = sizeof(clmi);
 	clmi.flags = CMIM_FLAGS | CMIF_HIDDEN | CMIF_TCHAR;
 
@@ -456,11 +456,10 @@ int AwayMsgPreShutdown(void)
 
 int LoadAwayMsgModule(void)
 {
-	CLISTMENUITEM mi = {0};
-
 	hWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
 	hWindowList2 = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
-	mi.cbSize = sizeof(mi);
+
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIF_TCHAR;
 
 	CreateServiceFunctionEx(MS_AWAYMSG_SHOWAWAYMSG, GetMessageCommand);
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index d572945340..bbac07d69a 100644
--- a/plugins/SimpleStatusMsg/src/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
@@ -1647,8 +1647,7 @@ static int ChangeStatusMsgPrebuild(WPARAM wParam, LPARAM lParam)
 	if (!iStatusMsgFlags || !iStatusMenuItemCount)
 		return 0;
 
-	CLISTMENUITEM mi = {0};
-	mi.cbSize = sizeof(mi);
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIF_ICONFROMICOLIB | CMIF_TCHAR;
 	if (!DBGetContactSettingByte(NULL, "SimpleStatusMsg", "ShowStatusMenuItem", 1))
 		mi.flags |= CMIF_HIDDEN;
-- 
cgit v1.2.3