diff options
Diffstat (limited to 'src/modules/clist')
| -rw-r--r-- | src/modules/clist/clui.cpp | 10 | ||||
| -rw-r--r-- | src/modules/clist/movetogroup.cpp | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index 612be5cd8e..8fcc0a3120 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -91,17 +91,14 @@ static int MenuItem_PreBuild(WPARAM, LPARAM) TCHAR cls[128];
HANDLE hItem;
HWND hwndClist = GetFocus();
- CLISTMENUITEM mi;
- ZeroMemory(&mi, sizeof(mi));
- mi.cbSize = sizeof(mi);
+ CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_FLAGS;
GetClassName(hwndClist, cls, SIZEOF(cls));
hwndClist = ( !lstrcmp(CLISTCONTROL_CLASS, cls)) ? hwndClist : cli.hwndContactList;
hItem = (HANDLE) SendMessage(hwndClist, CLM_GETSELECTION, 0, 0);
- if ( !hItem) {
+ if ( !hItem)
mi.flags = CMIM_FLAGS | CMIF_HIDDEN;
- }
CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) hRenameMenuItem, (LPARAM) & mi);
return 0;
}
@@ -356,8 +353,7 @@ int LoadCLUIModule(void) 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
}
{
- CLISTMENUITEM mi = { 0 };
- mi.cbSize = sizeof(mi);
+ CLISTMENUITEM mi = { sizeof(mi) };
CreateServiceFunction("CList/DeleteContactCommand", MenuItem_DeleteContact);
mi.position = 2000070000;
diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index 56a5e89ddb..0e5bfd5420 100644 --- a/src/modules/clist/movetogroup.cpp +++ b/src/modules/clist/movetogroup.cpp @@ -66,8 +66,7 @@ static TCHAR* PrepareGroupName(TCHAR* str) static void AddGroupItem(HGENMENU hRoot, TCHAR* name, int pos, WPARAM param, bool checked)
{
- CLISTMENUITEM mi = { 0 };
- mi.cbSize = sizeof(mi);
+ CLISTMENUITEM mi = { sizeof(mi) };
mi.hParentMenu = hRoot;
mi.popupPosition = param; // param to pszService - only with CMIF_CHILDPOPUP !!!!!!
mi.position = pos;
@@ -87,11 +86,8 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) int i;
OBJLIST<GroupItemSort> groups(10, GroupItemSort::compare);
- if ( !hMoveToGroupItem)
- {
- CLISTMENUITEM mi = {0};
-
- mi.cbSize = sizeof(mi);
+ if ( !hMoveToGroupItem) {
+ CLISTMENUITEM mi = { sizeof(mi) };
mi.position = 100000;
mi.pszName = LPGEN("&Move to Group");
mi.flags = CMIF_ROOTHANDLE | CMIF_ICONFROMICOLIB;
|