From d9fddc0cfa9066eb1b5ad3f4807b37426ae6ca88 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 5 Mar 2019 21:10:22 +0300 Subject: Popup: - wiping out checks for service presence; - code cleaning --- plugins/Nudge/src/main.cpp | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'plugins/Nudge/src') diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 20dcad8548..0d389c99f2 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -276,31 +276,13 @@ void Nudge_ShowPopup(CNudgeElement*, MCONTACT hContact, wchar_t * Message) hContact = db_mc_tryMeta(hContact); wchar_t *lpzContactName = Clist_GetContactDisplayName(hContact); - if (ServiceExists(MS_POPUP_ADDPOPUPCLASS)) { - POPUPDATACLASS NudgePopup = { 0 }; - NudgePopup.cbSize = sizeof(NudgePopup); - NudgePopup.hContact = hContact; - NudgePopup.pwszText = Message; - NudgePopup.pwszTitle = lpzContactName; - NudgePopup.pszClassName = "nudge"; - CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&NudgePopup); - } - else if (ServiceExists(MS_POPUP_ADDPOPUPW)) { - POPUPDATAW NudgePopup = { 0 }; - NudgePopup.lchContact = hContact; - NudgePopup.lchIcon = IcoLib_GetIconByHandle(iconList[0].hIcolib); - NudgePopup.colorBack = 0; - NudgePopup.colorText = 0; - NudgePopup.iSeconds = 0; - NudgePopup.PluginWindowProc = NudgePopupProc; - NudgePopup.PluginData = (void *)1; - - wcscpy_s(NudgePopup.lpwzText, Message); - wcscpy_s(NudgePopup.lpwzContactName, lpzContactName); - - CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&NudgePopup, 0); - } - else MessageBox(nullptr, Message, lpzContactName, 0); + POPUPDATACLASS NudgePopup = { 0 }; + NudgePopup.cbSize = sizeof(NudgePopup); + NudgePopup.hContact = hContact; + NudgePopup.pwszText = Message; + NudgePopup.pwszTitle = lpzContactName; + NudgePopup.pszClassName = "nudge"; + CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&NudgePopup); } void Nudge_SentStatus(CNudgeElement *n, MCONTACT hContact) -- cgit v1.2.3