From 30707c980d1560b358dbf2671a4d2a26a1e8173c Mon Sep 17 00:00:00 2001 From: George Hazan 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/UserInfoEx/src/svc_email.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'plugins/UserInfoEx/src/svc_email.cpp') diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index 563d0dabf4..ea4741414d 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -180,22 +180,15 @@ static INT OnContactSettingChanged(HANDLE hContact, DBCONTACTWRITESETTING* pdbcw **/ static INT OnPreBuildMenu(WPARAM wParam, LPARAM lParam) { - CLISTMENUITEM mi; - LPSTR val; - - ZeroMemory(&mi, sizeof(mi)); - mi.cbSize = sizeof(mi); + CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIM_FLAGS; - val = Get((HANDLE)wParam); + LPSTR val = Get((HANDLE)wParam); if (val) - { mir_free(val); - } else - { mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - } + CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)ghMenuItem, (LPARAM)&mi); return 0; } @@ -220,11 +213,8 @@ VOID SvcEMailRebuildMenu() if (!ghMenuItem) { - CLISTMENUITEM mi; - // insert contact menuitem - ZeroMemory(&mi, sizeof(mi)); - mi.cbSize = sizeof(mi); + CLISTMENUITEM mi = { sizeof(mi) }; mi.position = -2000010000; mi.hIcon = IcoLib_GetIcon(ICO_BTN_EMAIL); mi.pszName = "&E-mail"; -- cgit v1.2.3