diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-12-17 22:39:14 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-12-17 22:39:14 +0000 |
| commit | 1a69d21a165c1b952d697aab49b7cb4e14573c58 (patch) | |
| tree | e0490b0f7e8c8e4f7b299fcd22610e08cddde8b4 /plugins/Clist_mw/src/groupmenu.cpp | |
| parent | c5cd9533eabe06dd7cc3eda31290f8b11d09c79d (diff) | |
further frames code merging
git-svn-id: http://svn.miranda-ng.org/main/trunk@7266 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_mw/src/groupmenu.cpp')
| -rw-r--r-- | plugins/Clist_mw/src/groupmenu.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
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;
}
|