summaryrefslogtreecommitdiff
path: root/plugins/NewEventNotify/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/NewEventNotify/src')
-rw-r--r--plugins/NewEventNotify/src/options.cpp17
-rw-r--r--plugins/NewEventNotify/src/popup.cpp10
2 files changed, 11 insertions, 16 deletions
diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp
index a3c3a39373..9847c32859 100644
--- a/plugins/NewEventNotify/src/options.cpp
+++ b/plugins/NewEventNotify/src/options.cpp
@@ -263,16 +263,13 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
int OptionsAdd(WPARAM addInfo, LPARAM)
{
- if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
- OPTIONSDIALOGPAGE odp = {};
- odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
- odp.szTitle.a = LPGEN("Event Notify");
- odp.szGroup.a = LPGEN("Popups");
- odp.flags = ODPF_BOLDGROUPS;
- odp.pfnDlgProc = OptionsDlgProc;
- g_plugin.addOptions(addInfo, &odp);
- }
-
+ OPTIONSDIALOGPAGE odp = {};
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
+ odp.szTitle.a = LPGEN("Event Notify");
+ odp.szGroup.a = LPGEN("Popups");
+ odp.flags = ODPF_BOLDGROUPS;
+ odp.pfnDlgProc = OptionsDlgProc;
+ g_plugin.addOptions(addInfo, &odp);
return 0;
}
diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 92540ab0b0..c556b04c41 100644
--- a/plugins/NewEventNotify/src/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
@@ -406,12 +406,10 @@ int PopupShow(MCONTACT hContact, MEVENT hEvent, UINT eventType)
PopupList[NumberPopupData(NULL, -1)] = pdata;
// send data to popup plugin
- if (ServiceExists(MS_POPUP_ADDPOPUPW)) {
- // popup creation failed, release popupdata
- if (PUAddPopupW(&pudw) < 0) {
- FreePopupEventData(pdata);
- mir_free(pdata);
- }
+ // popup creation failed, release popupdata
+ if (PUAddPopupW(&pudw) < 0) {
+ FreePopupEventData(pdata);
+ mir_free(pdata);
}
if (dbe.pBlob)