From 1a69d21a165c1b952d697aab49b7cb4e14573c58 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 17 Dec 2013 22:39:14 +0000 Subject: further frames code merging git-svn-id: http://svn.miranda-ng.org/main/trunk@7266 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_mw/src/groupmenu.cpp | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'plugins/Clist_mw/src/groupmenu.cpp') diff --git a/plugins/Clist_mw/src/groupmenu.cpp b/plugins/Clist_mw/src/groupmenu.cpp index ba13c66479..c6fd1ea357 100644 --- a/plugins/Clist_mw/src/groupmenu.cpp +++ b/plugins/Clist_mw/src/groupmenu.cpp @@ -164,17 +164,15 @@ INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam) { } return(1); } + INT_PTR FreeOwnerDataGroupMenu (WPARAM wParam,LPARAM lParam) { - - lpGroupMenuExecParam mmep; - mmep = (lpGroupMenuExecParam)lParam; - if (mmep != NULL){ - FreeAndNil((void**)&mmep->szServiceName); - FreeAndNil((void**)&mmep); + lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)lParam; + if (mmep != NULL) { + mir_free(mmep->szServiceName); + mir_free(mmep); } - -return 0; + return 0; } INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam) @@ -489,13 +487,11 @@ INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam) INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam) { - lpSubGroupMenuExecParam mmep; - mmep = (lpSubGroupMenuExecParam)lParam; + lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)lParam; if (mmep != NULL) { - FreeAndNil((void**)&mmep->szServiceName); - FreeAndNil((void**)&mmep); + mir_free(mmep->szServiceName); + mir_free(mmep); } - return 0; } -- cgit v1.2.3