Popup:

- wiping out checks for service presence;
- code cleaning

2 files changed, 19 insertions, 21 deletions

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index c173aa2f79..cd52dde535 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -810,7 +810,7 @@ int StatusModeChanged(WPARAM wParam, LPARAM lParam)
 {

 	char *szProto = (char *)lParam;

 	if (opt.AutoDisable && (!opt.OnlyGlobalChanges || szProto == nullptr)) {

-		if (opt.DisablePopupGlobally && ServiceExists(MS_POPUP_QUERY)) {

+		if (opt.DisablePopupGlobally) {

 			char szSetting[12];

 			mir_snprintf(szSetting, "p%d", wParam);

 			BYTE hlpDisablePopup = g_plugin.getByte(szSetting, 0);

@@ -1084,8 +1084,7 @@ void InitMainMenuItem()
 	CMenuItem mi(&g_plugin);

 	SET_UID(mi, 0x22b7b4db, 0xa9a1, 0x4d43, 0x88, 0x80, 0x4c, 0x23, 0x20, 0x31, 0xc6, 0xa0);

 	mi.flags = CMIF_UNICODE;

-	if (ServiceExists(MS_POPUP_ADDPOPUPW))

-		mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Popups"), 0);

+	mi.root = g_plugin.addRootMenu(MO_MAIN, LPGENW("Popups"), 0);

 	mi.pszService = MS_STATUSCHANGE_MENUCOMMAND;

 	hEnableDisableMenu = Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index 178b1b9301..0a1b11abf8 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -1197,23 +1197,22 @@ int OptionsInitialize(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = DlgProcFiltering;

 	g_plugin.addOptions(wParam, &odp);

 

-	if (ServiceExists(MS_POPUP_ADDPOPUPW)) {

-		odp.szTitle.a = LPGEN("Status Notify");

-		odp.szGroup.a = LPGEN("Popups");

-		odp.szTab.a = LPGEN("General");

-		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);

-		odp.pfnDlgProc = DlgProcPopupOpts;

-		g_plugin.addOptions(wParam, &odp);

-

-		odp.szTab.a = LPGEN("Extra status");

-		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XPOPUP);

-		odp.pfnDlgProc = DlgProcXPopupOpts;

-		g_plugin.addOptions(wParam, &odp);

-

-		odp.szTab.a = LPGEN("Status message");

-		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMPOPUP);

-		odp.pfnDlgProc = DlgProcSMPopupOpts;

-		g_plugin.addOptions(wParam, &odp);

-	}

+	// Popups

+	odp.szTitle.a = LPGEN("Status Notify");

+	odp.szGroup.a = LPGEN("Popups");

+	odp.szTab.a = LPGEN("General");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);

+	odp.pfnDlgProc = DlgProcPopupOpts;

+	g_plugin.addOptions(wParam, &odp);

+

+	odp.szTab.a = LPGEN("Extra status");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XPOPUP);

+	odp.pfnDlgProc = DlgProcXPopupOpts;

+	g_plugin.addOptions(wParam, &odp);

+

+	odp.szTab.a = LPGEN("Status message");

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMPOPUP);

+	odp.pfnDlgProc = DlgProcSMPopupOpts;

+	g_plugin.addOptions(wParam, &odp);

 	return 0;

 }