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
---
 protocols/Yahoo/src/proto.cpp    |  9 ++++-----
 protocols/Yahoo/src/services.cpp | 21 +++++++--------------
 2 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'protocols/Yahoo/src')

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 6d42641ec4..124048995f 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -755,11 +755,10 @@ int __cdecl CYahooProto::OnEvent( PROTOEVENTTYPE eventType, WPARAM wParam, LPARA
 
 		case EV_PROTO_ONRENAME:
 			if ( mainMenuRoot ) {
-				CLISTMENUITEM clmi = { 0 };
-				clmi.cbSize = sizeof(CLISTMENUITEM);
-				clmi.flags = CMIM_NAME | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
-				clmi.ptszName = m_tszUserName;
-				CallService( MS_CLIST_MODIFYMENUITEM, ( WPARAM )mainMenuRoot, ( LPARAM )&clmi );
+				CLISTMENUITEM mi = { sizeof(mi) };
+				mi.flags = CMIM_NAME | CMIF_TCHAR | CMIF_KEEPUNTRANSLATED;
+				mi.ptszName = m_tszUserName;
+				CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)mainMenuRoot, (LPARAM)&mi );
 			}
 			break;
 
diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index 40166100ed..641b4e609c 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -378,8 +378,7 @@ void CYahooProto::MenuMainInit( void )
 	lstrcpyA( servicefunction, m_szModuleName );
 	char* tDest = servicefunction + lstrlenA( servicefunction );
 	
-	CLISTMENUITEM mi = { 0 };
-	mi.cbSize = sizeof( mi );
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.pszService = servicefunction;
 
 	HGENMENU hRoot = MO_GetProtoRootMenu( m_szModuleName );
@@ -480,8 +479,7 @@ void CYahooProto::MenuContactInit( void )
 	lstrcpyA( servicefunction, m_szModuleName );
 	char* tDest = servicefunction + lstrlenA( servicefunction );
 	
-	CLISTMENUITEM mi = { 0 };
-	mi.cbSize = sizeof( mi );
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIF_ICONFROMICOLIB;
 	mi.pszService = servicefunction;
 	mi.pszContactOwner = m_szModuleName;
@@ -507,24 +505,19 @@ void CYahooProto::MenuUninit( void )
 
 int __cdecl CYahooProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM)
 {
-    const HANDLE hContact = (HANDLE)wParam;
-	
-	CLISTMENUITEM mi = {0};
-	mi.cbSize = sizeof(mi);
-
+	const HANDLE hContact = (HANDLE)wParam;
 	if (!IsMyContact(hContact))  {
 		DebugLog("[OnPrebuildContactMenu] Not a Yahoo Contact!!!");
 		return 0;
 	}
 
+	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIM_FLAGS;
-	
-    if (GetWord( hContact, "yprotoid", 0) != 0) 
+	if (GetWord( hContact, "yprotoid", 0) != 0) 
 		mi.flags |= CMIF_HIDDEN;
-	
-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hShowProfileMenuItem, (LPARAM)&mi);
 
-    return 0;
+	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hShowProfileMenuItem, (LPARAM)&mi);
+	return 0;
 }
 
 
-- 
cgit v1.2.3