From 423be683866fd8e305457eb725d8cdbe1f297fbd Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Feb 2019 12:43:20 +0300 Subject: popup code cleaning (cause we have no tchar.h) --- plugins/NewEventNotify/src/options.cpp | 2 +- plugins/NewEventNotify/src/popup.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/NewEventNotify/src') diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp index 6ee731879b..a3c3a39373 100644 --- a/plugins/NewEventNotify/src/options.cpp +++ b/plugins/NewEventNotify/src/options.cpp @@ -263,7 +263,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L int OptionsAdd(WPARAM addInfo, LPARAM) { - if (ServiceExists(MS_POPUP_ADDPOPUPT)) { + if (ServiceExists(MS_POPUP_ADDPOPUPW)) { OPTIONSDIALOGPAGE odp = {}; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT); odp.szTitle.a = LPGEN("Event Notify"); diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp index 24c697f4c3..92540ab0b0 100644 --- a/plugins/NewEventNotify/src/popup.cpp +++ b/plugins/NewEventNotify/src/popup.cpp @@ -393,12 +393,12 @@ int PopupShow(MCONTACT hContact, MEVENT hEvent, UINT eventType) // if hContact is NULL, && hEvent is NULL then popup is only Test if ((hContact == NULL) && (hEvent == NULL)) { - wcsncpy(pudw.lptzContactName, TranslateT("Plugin Test"), MAX_CONTACTNAME); - wcsncpy(pudw.lptzText, TranslateW(sampleEvent), MAX_SECONDLINE); + wcsncpy(pudw.lpwzContactName, TranslateT("Plugin Test"), MAX_CONTACTNAME); + wcsncpy(pudw.lpwzText, TranslateW(sampleEvent), MAX_SECONDLINE); } else { // get the needed event data - wcsncpy(pudw.lptzContactName, Clist_GetContactDisplayName(hContact), MAX_CONTACTNAME); - wcsncpy(pudw.lptzText, ptrW(GetEventPreview(&dbe)), MAX_SECONDLINE); + wcsncpy(pudw.lpwzContactName, Clist_GetContactDisplayName(hContact), MAX_CONTACTNAME); + wcsncpy(pudw.lpwzText, ptrW(GetEventPreview(&dbe)), MAX_SECONDLINE); } PopupCount++; @@ -406,7 +406,7 @@ int PopupShow(MCONTACT hContact, MEVENT hEvent, UINT eventType) PopupList[NumberPopupData(NULL, -1)] = pdata; // send data to popup plugin - if (ServiceExists(MS_POPUP_ADDPOPUPT)) { + if (ServiceExists(MS_POPUP_ADDPOPUPW)) { // popup creation failed, release popupdata if (PUAddPopupW(&pudw) < 0) { FreePopupEventData(pdata); @@ -503,7 +503,7 @@ int PopupUpdate(MCONTACT hContact, MEVENT hEvent) if ((doReverse && eventData->next) || (!doReverse && eventData->prev)) mir_snwprintf(lpzText, L"%s\n...", lpzText); - PUChangeTextT(pdata->hWnd, lpzText); + PUChangeTextW(pdata->hWnd, lpzText); return 0; } -- cgit v1.2.3