diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-28 21:45:37 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-28 21:45:37 +0000 |
| commit | 30707c980d1560b358dbf2671a4d2a26a1e8173c (patch) | |
| tree | 74aee5adaaac976e1398274ca64c5461a60f1feb /protocols/Yahoo/src/services.cpp | |
| parent | 335ec43a4bfdcbbd0b2257037f1f3e0553d89076 (diff) | |
various menu initialization quirks
git-svn-id: http://svn.miranda-ng.org/main/trunk@2552 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src/services.cpp')
| -rw-r--r-- | protocols/Yahoo/src/services.cpp | 21 |
1 files changed, 7 insertions, 14 deletions
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;
}
|