Popup:

- wiping out checks for service presence;
- code cleaning

3 files changed, 9 insertions, 17 deletions

diff --git a/protocols/WebView/src/webview.cpp b/protocols/WebView/src/webview.cpp
index 87e5baf4a1..2075151f90 100644
--- a/protocols/WebView/src/webview.cpp
+++ b/protocols/WebView/src/webview.cpp
@@ -299,12 +299,10 @@ int OptInitialise(WPARAM wParam, LPARAM)
 	g_plugin.addOptions(wParam, &odp);
 
 	// if popup service exists
-	if ((ServiceExists(MS_POPUP_ADDPOPUPW))) {
-		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
-		odp.szGroup.a = LPGEN("Popups");
-		odp.pfnDlgProc = DlgPopUpOpts;
-		g_plugin.addOptions(wParam, &odp);
-	}
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
+	odp.szGroup.a = LPGEN("Popups");
+	odp.pfnDlgProc = DlgPopUpOpts;
+	g_plugin.addOptions(wParam, &odp);
 	return 0;
 }
 
diff --git a/protocols/WebView/src/webview_alerts.cpp b/protocols/WebView/src/webview_alerts.cpp
index 1b068f099e..776b100181 100644
--- a/protocols/WebView/src/webview_alerts.cpp
+++ b/protocols/WebView/src/webview_alerts.cpp
@@ -142,10 +142,7 @@ int PopupAlert(WPARAM hContact, LPARAM lParam)
 
 	ppd.PluginWindowProc = nullptr;
 	ppd.iSeconds = g_plugin.getDword(POP_DELAY_KEY, 0);
-
-	if (ServiceExists(MS_POPUP_ADDPOPUPW))
-		CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&ppd, 0);
-
+	PUAddPopupW(&ppd);
 	return 0;
 }
 
@@ -184,7 +181,7 @@ int ErrorMsgs(WPARAM wParam, LPARAM lParam)
 		return 0;
 
 	wchar_t *ptszContactName = Clist_GetContactDisplayName(hContact);
-	if (ServiceExists(MS_POPUP_ADDPOPUPW) && g_plugin.getByte(ERROR_POPUP_KEY, 0)) {
+	if (g_plugin.getByte(ERROR_POPUP_KEY, 0)) {
 		mir_snwprintf(newdisplaytext, L"%s\n%s", ptszContactName, displaytext);
 		PUShowMessageW(newdisplaytext, SM_WARNING);
 	}
diff --git a/protocols/WebView/src/webview_opts.cpp b/protocols/WebView/src/webview_opts.cpp
index 0c51759b42..35b47b8110 100644
--- a/protocols/WebView/src/webview_opts.cpp
+++ b/protocols/WebView/src/webview_opts.cpp
@@ -1092,12 +1092,10 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			}
 			else {
 				CheckDlgButton(hwndDlg, IDC_SUPPRESS, BST_UNCHECKED);
-				if ((ServiceExists(MS_POPUP_ADDPOPUPW) != 0))
-					EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 1);
+				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 1);
 			}
 
-			if (ServiceExists(MS_POPUP_ADDPOPUPW) == 0)
-				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 0);
+			EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 0);
 
 			if (g_plugin.getByte(UPDATE_ONSTART_KEY, 0)) {
 				EnableWindow(GetDlgItem(hwndDlg, IDC_START_DELAY), 1);
@@ -1167,8 +1165,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			break;
 
 		case IDC_SUPPRESS:
-			if ((ServiceExists(MS_POPUP_ADDPOPUPW) != 0))
-				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), (!(IsDlgButtonChecked(hwndDlg, IDC_SUPPRESS))));
+			EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), (!(IsDlgButtonChecked(hwndDlg, IDC_SUPPRESS))));
 			break;
 
 		case IDC_UPDATE_ONSTART: