From d9fddc0cfa9066eb1b5ad3f4807b37426ae6ca88 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 5 Mar 2019 21:10:22 +0300
Subject: Popup:

- wiping out checks for service presence;
- code cleaning
---
 plugins/Scriver/src/globals.h      |  1 -
 plugins/Scriver/src/msgoptions.cpp | 17 ++++++++---------
 plugins/Scriver/src/msgs.cpp       |  1 -
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'plugins/Scriver')

diff --git a/plugins/Scriver/src/globals.h b/plugins/Scriver/src/globals.h
index 0800dda15f..7bb80122aa 100644
--- a/plugins/Scriver/src/globals.h
+++ b/plugins/Scriver/src/globals.h
@@ -93,7 +93,6 @@ struct GlobalMessageData
 	SendMode   sendMode;
 	int        tabIconListUsageSize;
 	int        smileyAddInstalled;
-	int        popupInstalled;
 	int        ieviewInstalled;
 	int        limitTabsNum;
 	int        limitChatsTabsNum;
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 84d51a4244..6f2ec42c36 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -940,14 +940,13 @@ int OptInitialise(WPARAM wParam, LPARAM)
 	odp.szTab.a = nullptr;
 	g_plugin.addOptions(wParam, &odp);
 
-	if (g_dat.popupInstalled) {
-		odp.position = 910000002;
-		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);
-		odp.szGroup.a = LPGEN("Popups");
-		odp.szTitle.a = LPGEN("Messaging");
-		odp.pfnDlgProc = DlgProcOptionsPopup;
-		odp.flags = ODPF_BOLDGROUPS;
-		g_plugin.addOptions(wParam, &odp);
-	}
+	////////////////////////////////////////////////////////////////////////////////////////
+	odp.position = 910000002;
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);
+	odp.szGroup.a = LPGEN("Popups");
+	odp.szTitle.a = LPGEN("Messaging");
+	odp.pfnDlgProc = DlgProcOptionsPopup;
+	odp.flags = ODPF_BOLDGROUPS;
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 88080137e9..9913193237 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -550,7 +550,6 @@ int RegisterToolbarIcons(WPARAM, LPARAM)
 static int ModuleLoad(WPARAM, LPARAM)
 {
 	g_dat.smileyAddInstalled = ServiceExists(MS_SMILEYADD_SHOWSELECTION) && ServiceExists(MS_SMILEYADD_REPLACESMILEYS);
-	g_dat.popupInstalled = ServiceExists(MS_POPUP_ADDPOPUPW);
 	g_dat.ieviewInstalled = ServiceExists(MS_IEVIEW_WINDOW);
 	return 0;
 }
-- 
cgit v1.2.3