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/MyDetails/src/frame.cpp     | 23 ++++++++++-------------
 plugins/MyDetails/src/mydetails.cpp |  5 ++---
 2 files changed, 12 insertions(+), 16 deletions(-)

(limited to 'plugins/MyDetails/src')

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index f2e056082b..3dca1c808a 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -317,17 +317,15 @@ int CreateFrame()
 
 		// Create menu item
 
-		CLISTMENUITEM menu = {0};
-
-		menu.cbSize=sizeof(menu);
-		menu.flags = CMIF_TCHAR;
-		menu.popupPosition = -0x7FFFFFFF;
-		menu.ptszPopupName = LPGENT("My Details");
-		menu.position = 1; // 500010000
-		menu.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-		menu.ptszName = LPGENT("Show My Details");
-		menu.pszService= MODULE_NAME "/ShowHideMyDetails";
-		hMenuShowHideFrame = Menu_AddMainMenuItem(&menu);
+		CLISTMENUITEM mi = { sizeof(mi) };
+		mi.flags = CMIF_TCHAR;
+		mi.popupPosition = -0x7FFFFFFF;
+		mi.ptszPopupName = LPGENT("My Details");
+		mi.position = 1; // 500010000
+		mi.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
+		mi.ptszName = LPGENT("Show My Details");
+		mi.pszService= MODULE_NAME "/ShowHideMyDetails";
+		hMenuShowHideFrame = Menu_AddMainMenuItem(&mi);
 
 		if ( db_get_b(0, MODULE_NAME, SETTING_FRAME_VISIBLE, 1) == 1) {
 			ShowWindow(hwnd_container, SW_SHOW);
@@ -2485,8 +2483,7 @@ INT_PTR HideFrameFunc(WPARAM wParam, LPARAM lParam)
 
 void FixMainMenu() 
 {
-	CLISTMENUITEM mi = {0};
-	mi.cbSize = sizeof(CLISTMENUITEM);
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIM_NAME;
 
 	if (MyDetailsFrameVisible())
diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp
index 188e41e748..52b8fb2666 100644
--- a/plugins/MyDetails/src/mydetails.cpp
+++ b/plugins/MyDetails/src/mydetails.cpp
@@ -150,11 +150,10 @@ static int MainInit(WPARAM wparam,LPARAM lparam)
 	InitProtocolData();
 
 	// Add options to menu
-	CLISTMENUITEM mi;
+   // !!!!!!!! check it later
+	CLISTMENUITEM mi = { sizeof(mi) };
 
 	if (protocols->CanSetAvatars()) {
-		ZeroMemory(&mi,sizeof(mi));
-		mi.cbSize = sizeof(mi);
 		mi.flags = CMIF_TCHAR;
 		mi.popupPosition = 500050000;
 		mi.ptszPopupName = LPGENT("My Details");
-- 
cgit v1.2.3