From a0e65f57dd9f199f1143e4b91fad938eaf87d8f9 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 16 Nov 2012 06:54:59 +0000 Subject: tabs and spaces cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@2324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/Docking.cpp | 36 ++++++++++++++++----------------- src/modules/clist/clui.cpp | 12 +++++++---- src/modules/clist/contacts.cpp | 40 +++++++++++++++++++++++-------------- src/modules/clist/genmenu.cpp | 37 +++++++++++++++++++++------------- src/modules/clist/genmenu.h | 2 +- src/modules/clist/genmenuopt.cpp | 39 ++++++++++++++++++++++++------------ src/modules/clist/groups.cpp | 7 +++---- src/modules/clist/movetogroup.cpp | 2 +- src/modules/clist/protocolorder.cpp | 9 +++++++-- 9 files changed, 112 insertions(+), 72 deletions(-) (limited to 'src/modules/clist') diff --git a/src/modules/clist/Docking.cpp b/src/modules/clist/Docking.cpp index cfcfc2a36d..3308176347 100644 --- a/src/modules/clist/Docking.cpp +++ b/src/modules/clist/Docking.cpp @@ -164,7 +164,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if ( !docked && msg->message != WM_CREATE && msg->message != WM_MOVING) return 0; - switch (msg->message) + switch (msg->message) { case WM_CREATE: draggingTitle = 0; @@ -183,7 +183,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) LPWINDOWPOS wp = (LPWINDOWPOS)msg->lParam; bool vis = Docking_IsWindowVisible(msg->hwnd); - if (wp->flags & SWP_SHOWWINDOW) + if (wp->flags & SWP_SHOWWINDOW) vis = !IsIconic(msg->hwnd); if (wp->flags & SWP_HIDEWINDOW) vis = false; @@ -193,21 +193,21 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if ( !(wp->flags & (SWP_NOMOVE | SWP_NOSIZE))) { bool addbar = Docking_Command(msg->hwnd, ABM_NEW) != 0; - + RECT rc = {0}; GetWindowRect(msg->hwnd, &rc); int cx = rc.right - rc.left; if ( !(wp->flags & SWP_NOMOVE)) { rc.left = wp->x; rc.top = wp->y; } - if (addbar) + if (addbar) Docking_RectToDock(&rc); - if ( !(wp->flags & SWP_NOSIZE)) - { - rc.right = rc.left + wp->cx; - rc.bottom = rc.top + wp->cy; - addbar |= (cx != wp->cx); + if ( !(wp->flags & SWP_NOSIZE)) + { + rc.right = rc.left + wp->cx; + rc.bottom = rc.top + wp->cy; + addbar |= (cx != wp->cx); } Docking_SetSize(msg->hwnd, &rc, !addbar, false); @@ -215,12 +215,12 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if ( !(wp->flags & SWP_NOMOVE)) { wp->x = rc.left; wp->y = rc.top; } if ( !(wp->flags & SWP_NOSIZE)) wp->cy = rc.bottom - rc.top; - *((LRESULT *) lParam) = TRUE; + *((LRESULT *) lParam) = TRUE; return TRUE; } else { - if ((wp->flags & SWP_SHOWWINDOW) && Docking_Command(msg->hwnd, ABM_NEW)) + if ((wp->flags & SWP_SHOWWINDOW) && Docking_Command(msg->hwnd, ABM_NEW)) { RECT rc = {0}; GetWindowRect(msg->hwnd, &rc); @@ -228,8 +228,8 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) Docking_SetSize(msg->hwnd, &rc, false, false); - wp->x = rc.left; - wp->y = rc.top; + wp->x = rc.left; + wp->y = rc.top; wp->cy = rc.bottom - rc.top; wp->cx = rc.right - rc.left; wp->flags &= ~(SWP_NOSIZE | SWP_NOMOVE); @@ -243,7 +243,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) { LPWINDOWPOS wp = (LPWINDOWPOS)msg->lParam; bool vis = Docking_IsWindowVisible(msg->hwnd); - if (wp->flags & SWP_SHOWWINDOW) + if (wp->flags & SWP_SHOWWINDOW) vis = !IsIconic(msg->hwnd); if (wp->flags & SWP_HIDEWINDOW) vis = false; @@ -284,7 +284,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) if (((ptCursor.x < rcMonitor.left + EDGESENSITIVITY) || (ptCursor.x >= rcMonitor.right - EDGESENSITIVITY)) && - db_get_b(NULL, "CLUI", "DockToSides", 1)) + db_get_b(NULL, "CLUI", "DockToSides", 1)) { docked = (ptCursor.x < rcMonitor.left + EDGESENSITIVITY) ? DOCKED_LEFT : DOCKED_RIGHT; PostMessage(msg->hwnd, WM_LBUTTONUP, 0, MAKELPARAM(ptCursor.x, ptCursor.y)); @@ -292,7 +292,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) Docking_Command(msg->hwnd, ABM_NEW); Docking_AdjustPosition(msg->hwnd, &rcMonitor, (LPRECT)msg->lParam, false, true); - *((LRESULT *) lParam) = TRUE; + *((LRESULT *) lParam) = TRUE; return TRUE; } } @@ -302,7 +302,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) switch (DefWindowProc(msg->hwnd, WM_NCHITTEST, msg->wParam, msg->lParam)) { case HTSIZE: case HTTOP: case HTTOPLEFT: case HTTOPRIGHT: - case HTBOTTOM: case HTBOTTOMRIGHT: case HTBOTTOMLEFT: + case HTBOTTOM: case HTBOTTOMRIGHT: case HTBOTTOMLEFT: *((LRESULT *) lParam) = HTCLIENT; return TRUE; @@ -360,7 +360,7 @@ int fnDocking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) break; case WM_LBUTTONUP: - if (draggingTitle) + if (draggingTitle) { ReleaseCapture(); draggingTitle = 0; diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index c51530f676..15f6ab4e8e 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -209,7 +209,9 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam) TranslateT("This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network."), TranslateT("Delete Contact"), MB_OK); return 0; - } } } + } + } + } CallService(MS_DB_CONTACT_DELETE, wParam, 0); } @@ -445,7 +447,8 @@ void fnDrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon) DrawState(dis->hDC, NULL, NULL, (LPARAM) hIcon, 0, 4 + g_IconWidth, (dis->rcItem.bottom + dis->rcItem.top - g_IconHeight) / 2 + (dis->itemState & ODS_SELECTED ? 1 : 0), 0, 0, DST_ICON | (dis->itemState & ODS_INACTIVE ? DSS_DISABLED : DSS_NORMAL)); } else DrawState(dis->hDC, NULL, NULL, (LPARAM) hIcon, 0, (dis->rcItem.right + dis->rcItem.left - g_IconWidth) / 2 + (dis->itemState & ODS_SELECTED ? 1 : 0), (dis->rcItem.bottom + dis->rcItem.top - g_IconHeight) / 2 + (dis->itemState & ODS_SELECTED ? 1 : 0), 0, 0, DST_ICON | (dis->itemState & ODS_INACTIVE ? DSS_DISABLED : DSS_NORMAL)); - } } + } + } DestroyIcon(hIcon); return; @@ -719,7 +722,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case SC_MINIMIZE: case SC_CLOSE: - if ((GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) || + if ((GetWindowLongPtr(hwnd, GWL_EXSTYLE) & WS_EX_TOOLWINDOW) || db_get_b(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT)) { ShowWindow(hwnd, SW_HIDE); @@ -1083,7 +1086,8 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return TRUE; } return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam); - } } + } + } return 0; case WM_CLOSE: diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp index 60a2a3d443..65ecf618e3 100644 --- a/src/modules/clist/contacts.cpp +++ b/src/modules/clist/contacts.cpp @@ -276,10 +276,12 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) { return 0; } if (dbv.type == DBVT_WCHAR && (ci->dwFlag & CNF_UNICODE)) { - ci->type = CNFT_ASCIIZ; - ci->pszVal = dbv.ptszVal; - return 0; - } } } + ci->type = CNFT_ASCIIZ; + ci->pszVal = dbv.ptszVal; + return 0; + } + } + } break; } case 6: // first + last name @@ -318,7 +320,9 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) { ci->pszVal = (TCHAR*)mir_strdup(Translate("'(Unknown Contact)'")); ci->type = CNFT_ASCIIZ; return 0; - } } } + } + } + } break; case CNF_TIMEZONE: { @@ -344,7 +348,8 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) { } ci->szProto = saveProto; break; - } } + } + } return 1; } @@ -355,18 +360,19 @@ struct ContactOptionsData { }; static INT_PTR CALLBACK ContactOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam) -{ struct ContactOptionsData *dat; - - dat = (struct ContactOptionsData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); +{ + struct ContactOptionsData *dat = (struct ContactOptionsData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); switch (msg) { case WM_INITDIALOG: - { TranslateDialogDefault(hwndDlg); + { + TranslateDialogDefault(hwndDlg); dat = (struct ContactOptionsData*)mir_alloc(sizeof(struct ContactOptionsData)); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)dat); dat->dragging = 0; SetWindowLongPtr( GetDlgItem(hwndDlg, IDC_NAMEORDER), GWL_STYLE, GetWindowLongPtr( GetDlgItem(hwndDlg, IDC_NAMEORDER), GWL_STYLE)|TVS_NOHSCROLL); - { TVINSERTSTRUCT tvis; + { + TVINSERTSTRUCT tvis; int i; tvis.hParent = NULL; tvis.hInsertAfter = TVI_LAST; @@ -375,14 +381,16 @@ static INT_PTR CALLBACK ContactOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPara tvis.item.lParam = nameOrder[i]; tvis.item.pszText = TranslateTS(nameOrderDescr[ nameOrder[i]]); TreeView_InsertItem( GetDlgItem(hwndDlg, IDC_NAMEORDER), &tvis); - } } + } + } return TRUE; } case WM_NOTIFY: switch (((LPNMHDR)lParam)->idFrom) { case 0: if (((LPNMHDR)lParam)->code == PSN_APPLY) - { DBCONTACTWRITESETTING cws; + { + DBCONTACTWRITESETTING cws; TVITEM tvi; int i; cws.szModule = "Contact"; @@ -417,7 +425,8 @@ static INT_PTR CALLBACK ContactOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPara break; case WM_MOUSEMOVE: if ( !dat->dragging) break; - { TVHITTESTINFO hti; + { + TVHITTESTINFO hti; hti.pt.x = (short)LOWORD(lParam); hti.pt.y = (short)HIWORD(lParam); ClientToScreen(hwndDlg, &hti.pt); @@ -440,7 +449,8 @@ static INT_PTR CALLBACK ContactOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPara TreeView_SetInsertMark( GetDlgItem(hwndDlg, IDC_NAMEORDER), NULL, 0); dat->dragging = 0; ReleaseCapture(); - { TVHITTESTINFO hti; + { + TVHITTESTINFO hti; TVITEM tvi; hti.pt.x = (short)LOWORD(lParam); hti.pt.y = (short)HIWORD(lParam); diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp index e3b81c23e4..df8903a58d 100644 --- a/src/modules/clist/genmenu.cpp +++ b/src/modules/clist/genmenu.cpp @@ -42,7 +42,8 @@ static void DumpMenuItem(TMO_IntMenuItem* pParent, int level = 0) PMO_IntMenuItem submenu = pimi->submenu.first; if (submenu) DumpMenuItem(submenu, level+1); -} } + } +} #endif @@ -61,7 +62,8 @@ void FreeAndNil(void **p) if (*p != NULL) { mir_free(*p); *p = NULL; -} } + } +} int GetMenuObjbyId(const int id) { @@ -639,7 +641,7 @@ PMO_IntMenuItem MO_AddNewMenuItem(HANDLE menuobjecthandle, PMO_MenuItem pmi) p->originalPosition = pmi->position; p->hLangpack = pmi->hLangpack; - if (pmi->flags & CMIF_UNICODE) + if (pmi->flags & CMIF_UNICODE) p->mi.ptszName = mir_tstrdup(pmi->ptszName); else p->mi.ptszName = mir_a2u(pmi->pszName); @@ -658,7 +660,8 @@ PMO_IntMenuItem MO_AddNewMenuItem(HANDLE menuobjecthandle, PMO_MenuItem pmi) p->hIcolibItem = hIcolibItem; } else p->iconId = ImageList_AddIcon(pmo->m_hMenuIcons, pmi->hIcon); - } } + } + } if (p->mi.root == HGENMENU_ROOT) p->mi.root = NULL; @@ -752,7 +755,8 @@ static int WhereToPlace(HMENU hMenu, PMO_MenuItem mi) if (pimi != NULL) if (pimi->mi.position <= mi->position) return i+1; - } } + } + } return 0; } @@ -802,7 +806,9 @@ static void InsertMenuItemWithSeparators(HMENU hMenu, int uItem, MENUITEMINFO *l if ( !(uItem < GetMenuItemCount(hMenu) && GetMenuItemType(hMenu, uItem) == MFT_SEPARATOR)) InsertSeparator(hMenu, uItem); uItem++; - } } } + } + } + } //check for separator after if (uItem < GetMenuItemCount(hMenu)) { @@ -889,7 +895,7 @@ HMENU BuildRecursiveMenu(HMENU hMenu, PMO_IntMenuItem pRootMenu, ListParam *para if (mi->flags & CMIF_HIDDEN) continue; - if (pmo->CheckService != NULL) { + if (pmo->CheckService != NULL) { TCheckProcParam CheckParam; CheckParam.lParam = param->lParam; CheckParam.wParam = param->wParam; @@ -1008,7 +1014,8 @@ HMENU BuildRecursiveMenu(HMENU hMenu, PMO_IntMenuItem pRootMenu, ListParam *para continue; InsertMenuItemWithSeparators(hMenu, i, &mii); - } } + } + } return hMenu; } @@ -1047,9 +1054,9 @@ int OnIconLibChanges(WPARAM, LPARAM) static int MO_RegisterIcon(PMO_IntMenuItem pmi, void*) { - TCHAR *uname = (pmi->UniqName) ? mir_a2t(pmi->UniqName) : mir_tstrdup(pmi->CustomName), - *descr = GetMenuItemText(pmi); - + TCHAR *uname = (pmi->UniqName) ? mir_a2t(pmi->UniqName) : mir_tstrdup(pmi->CustomName), + *descr = GetMenuItemText(pmi); + if ( !uname && !descr) return FALSE; @@ -1065,7 +1072,7 @@ static int MO_RegisterIcon(PMO_IntMenuItem pmi, void*) // remove '&' if (descr) { descr = NEWTSTR_ALLOCA(descr); - + for (TCHAR *p = descr; *p; p++) { if ((p = _tcschr(p, '&')) == NULL) break; @@ -1118,7 +1125,8 @@ int TryProcessDoubleClick(HANDLE hContact) if (pimi != NULL) { MO_ProcessCommand(pimi, (LPARAM)hContact); return 0; - } } + } + } return 1; } @@ -1192,7 +1200,8 @@ int InitGenMenu() int UnitGenMenu() { if (bIsGenMenuInited) { - { mir_cslock lck(csMenuHook); + { + mir_cslock lck(csMenuHook); MO_RemoveAllObjects(); bIsGenMenuInited = false; } diff --git a/src/modules/clist/genmenu.h b/src/modules/clist/genmenu.h index 81f737d405..06bb467d40 100644 --- a/src/modules/clist/genmenu.h +++ b/src/modules/clist/genmenu.h @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct { struct _tagIntMenuItem *first, // first element of submenu, or NULL - *last; // last element of submenu, or NULL + *last; // last element of submenu, or NULL } TMO_LinkedList; diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp index 2d31c862c8..d3b0b157c3 100644 --- a/src/modules/clist/genmenuopt.cpp +++ b/src/modules/clist/genmenuopt.cpp @@ -209,7 +209,8 @@ static void FreeTreeData(HWND hwndDlg) tvi.mask = TVIF_HANDLE | TVIF_PARAM; tvi.hItem = hItem; TreeView_GetItem( GetDlgItem(hwndDlg, IDC_MENUITEMS), &tvi); - { MenuItemOptData* O = (MenuItemOptData *)tvi.lParam; + { + MenuItemOptData* O = (MenuItemOptData *)tvi.lParam; if (O->name) mir_free(O->name); if (O->defname) mir_free(O->defname); if (O->uniqname) mir_free(O->uniqname); @@ -220,7 +221,8 @@ static void FreeTreeData(HWND hwndDlg) TreeView_SetItem( GetDlgItem(hwndDlg, IDC_MENUITEMS), &tvi); hItem = TreeView_GetNextSibling( GetDlgItem(hwndDlg, IDC_MENUITEMS), hItem); -} } + } +} static int BuildTree(HWND hwndDlg, int MenuObjectId, BOOL bReread) { @@ -241,7 +243,7 @@ static int BuildTree(HWND hwndDlg, int MenuObjectId, BOOL bReread) mir_snprintf(MenuNameItems, sizeof(MenuNameItems), "%s_Items", pimo->Name); int count = 0; - { + { for (PMO_IntMenuItem p = pimo->m_items.first; p != NULL; p = p->next) if (p->mi.root == (HGENMENU)-1 || p->mi.root == NULL) count++; @@ -287,7 +289,8 @@ static int BuildTree(HWND hwndDlg, int MenuObjectId, BOOL bReread) PDar[ count ] = PD; count++; - } } + } + } qsort(PDar, count, sizeof(lpMenuItemOptData), sortfunc); @@ -316,7 +319,7 @@ static int BuildTree(HWND hwndDlg, int MenuObjectId, BOOL bReread) tvis.item.lParam = (LPARAM)PDar[i]; tvis.item.pszText = PDar[i]->name; tvis.item.iImage = tvis.item.iSelectedImage = PDar[i]->show; - + HTREEITEM hti = (HTREEITEM)SendDlgItemMessage(hwndDlg, IDC_MENUITEMS, TVM_INSERTITEM, 0, (LPARAM)&tvis); if (first) { TreeView_SelectItem( GetDlgItem(hwndDlg, IDC_MENUITEMS), hti); @@ -416,7 +419,9 @@ LRESULT CALLBACK LBTNDOWNProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam TreeView_SetItem(tvw, &tvi); } while (hit = TreeView_GetNextSibling(tvw, hit)); - } } } + } + } + } return CallWindowProc(MyOldWindowProc, hwnd, uMsg, wParam, lParam); } @@ -528,7 +533,8 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } break; - } } + } + } break; case WM_NOTIFY: @@ -626,7 +632,9 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA TreeView_SetItem(tvw, &tvi); } while (hit = TreeView_GetNextSibling(tvw, hit)); - } } } + } + } + } break; } case TVN_SELCHANGING: @@ -680,7 +688,8 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA break; } break; - } } + } + } break; case WM_MOUSEMOVE: @@ -706,7 +715,8 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (hti.flags&TVHT_ABOVE) SendDlgItemMessage(hwndDlg, IDC_MENUITEMS, WM_VSCROLL, MAKEWPARAM(SB_LINEUP, 0), 0); if (hti.flags&TVHT_BELOW) SendDlgItemMessage(hwndDlg, IDC_MENUITEMS, WM_VSCROLL, MAKEWPARAM(SB_LINEDOWN, 0), 0); TreeView_SetInsertMark( GetDlgItem(hwndDlg, IDC_MENUITEMS), NULL, 0); - } } + } + } break; case WM_LBUTTONUP: @@ -761,15 +771,18 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (insertAfter) insertAfter = MoveItemAbove(tvw, pSIT[i], insertAfter); else break; if ( !i) FirstItem = insertAfter; - } } + } + } // free pointers... mir_free(pSIT); - } } + } + } if (FirstItem) TreeView_SelectItem(tvw, FirstItem); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); SaveTree(hwndDlg); - } } + } + } break; case WM_DESTROY: diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp index 1351289f49..fb9ce4cc3b 100644 --- a/src/modules/clist/groups.cpp +++ b/src/modules/clist/groups.cpp @@ -184,8 +184,8 @@ static INT_PTR DeleteGroup(WPARAM wParam, LPARAM) CLISTGROUPCHANGE grpChg = { sizeof(CLISTGROUPCHANGE), NULL, NULL }; for (hContact = db_find_first(); - hContact; - hContact = db_find_next(hContact)) + hContact; + hContact = db_find_next(hContact)) { if (DBGetContactSettingTString(hContact, "CList", "Group", &dbv)) continue; @@ -282,8 +282,7 @@ static int RenameGroupWithMove(int groupId, const TCHAR *szName, int move) cache->tszGroup = 0; cli.pfnCheckCacheItem(cache); } - } - while ((hContact = db_find_next(hContact)) != NULL); + } while ((hContact = db_find_next(hContact)) != NULL); //rename subgroups { diff --git a/src/modules/clist/movetogroup.cpp b/src/modules/clist/movetogroup.cpp index 83c233cefd..56a5e89ddb 100644 --- a/src/modules/clist/movetogroup.cpp +++ b/src/modules/clist/movetogroup.cpp @@ -87,7 +87,7 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) int i; OBJLIST groups(10, GroupItemSort::compare); - if ( !hMoveToGroupItem) + if ( !hMoveToGroupItem) { CLISTMENUITEM mi = {0}; diff --git a/src/modules/clist/protocolorder.cpp b/src/modules/clist/protocolorder.cpp index 25e1556c56..3da777b137 100644 --- a/src/modules/clist/protocolorder.cpp +++ b/src/modules/clist/protocolorder.cpp @@ -250,7 +250,11 @@ INT_PTR CALLBACK ProtocolOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM pData->show = tvi.iImage; TreeView_SetItem(((LPNMHDR)lParam)->hwndFrom, &tvi); SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0); - } } } } } + } + } + } + } + } break; } break; @@ -325,7 +329,8 @@ INT_PTR CALLBACK ProtocolOrderOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM tvis.hInsertAfter = hti.hItem; TreeView_SelectItem(hwndProtoOrder, TreeView_InsertItem(hwndProtoOrder, &tvis)); SendMessage(GetParent(hwndDlg), PSM_CHANGED, (WPARAM)hwndDlg, 0); - } } + } + } break; } return FALSE; -- cgit v1.2.3