summaryrefslogtreecommitdiff
path: root/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp')
-rw-r--r--plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp31
1 files changed, 14 insertions, 17 deletions
diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index 7059a5563d..002da5d970 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -162,7 +162,8 @@ INT_PTR GroupMenuonAddService(WPARAM wParam,LPARAM lParam)
//called with:
//wparam - ownerdata
//lparam - lparam from winproc
-INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam) {
+INT_PTR GroupMenuExecService(WPARAM wParam,LPARAM lParam)
+{
if (wParam!=0) {
lpGroupMenuExecParam mmep=(lpGroupMenuExecParam)wParam;
if ( !strcmp(mmep->szServiceName,"Help/AboutCommand")) {
@@ -176,19 +177,17 @@ 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);
+INT_PTR FreeOwnerDataGroupMenu(WPARAM wParam, LPARAM lParam)
+{
+ lpGroupMenuExecParam mmep = (lpGroupMenuExecParam)lParam;
+ if (mmep != NULL) {
+ mir_free(mmep->szServiceName);
+ mir_free(mmep);
}
-
return 0;
-};
+}
INT_PTR HideGroupsHelper(WPARAM wParam,LPARAM lParam)
{
@@ -519,13 +518,11 @@ INT_PTR SubGroupMenuExecService(WPARAM wParam,LPARAM lParam) {
INT_PTR FreeOwnerDataSubGroupMenu (WPARAM wParam,LPARAM lParam)
{
- lpSubGroupMenuExecParam mmep;
- mmep=(lpSubGroupMenuExecParam)lParam;
- if (mmep!=NULL) {
- FreeAndNil((void **)&mmep->szServiceName);
- FreeAndNil((void **)&mmep);
+ lpSubGroupMenuExecParam mmep = (lpSubGroupMenuExecParam)lParam;
+ if (mmep != NULL) {
+ mir_free(mmep->szServiceName);
+ mir_free(mmep);
}
-
return 0;
}