diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-17 15:57:56 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2012-06-17 15:57:56 +0000 |
| commit | 184cfd6515bea3ffe4c61c71dfd3a65c87eb880b (patch) | |
| tree | 1acf9122a0d9876a896b505f51020c1d194d830e /plugins/TabSRMM/src/eventpopups.cpp | |
| parent | 122baf7f7465e0b5b890729d65914f527db1ca26 (diff) | |
cosmetic settings fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@459 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/eventpopups.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/eventpopups.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index 5dfc2e8245..0ba639cf09 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -80,8 +80,8 @@ static void PU_CleanUp() if ((*it)->hContact == 0) {
//_DebugTraceW(_T("found stale popup %s"), (*it)->eventData->szText);
if ((*it)->eventData)
- free((*it)->eventData);
- free(*it);
+ mir_free((*it)->eventData);
+ mir_free(*it);
it = PopupList.erase(it);
continue;
}
@@ -737,7 +737,7 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent if(hEvent == 0 && hContact == 0)
dbe.szModule = Translate("Unknown module or contact");
- pdata = (PLUGIN_DATAT *)malloc(sizeof(PLUGIN_DATAT));
+ pdata = (PLUGIN_DATAT *)mir_alloc(sizeof(PLUGIN_DATAT));
ZeroMemory((void *)pdata, sizeof(PLUGIN_DATAT));
pdata->eventType = eventType;
@@ -768,7 +768,7 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent } else
mir_sntprintf(pud.lptzText, MAX_SECONDLINE, _T(" "));
- pdata->eventData = (EVENT_DATAT *)malloc(NR_MERGED * sizeof(EVENT_DATAT));
+ pdata->eventData = (EVENT_DATAT *)mir_alloc(NR_MERGED * sizeof(EVENT_DATAT));
pdata->eventData[0].hEvent = hEvent;
pdata->eventData[0].timestamp = dbe.timestamp;
_tcsncpy(pdata->eventData[0].szText, pud.lptzText, MAX_SECONDLINE);
@@ -780,8 +780,8 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent if (CallService(MS_POPUP_ADDPOPUPT, (WPARAM)&pud, 0) < 0) {
// failed to display, perform cleanup
if (pdata->eventData)
- free(pdata->eventData);
- free(pdata);
+ mir_free(pdata->eventData);
+ mir_free(pdata);
}
else
PopupList.push_back(pdata);
|