From fe72fbef65b67f80d7577bf412a0993ed78f228e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 11 Jun 2014 20:38:14 +0000
Subject: correct ServiceExists call for popups

git-svn-id: http://svn.miranda-ng.org/main/trunk@9435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/IcqOscarJ/src/init.cpp        | 2 +-
 protocols/MRA/src/MraPopUp.cpp          | 2 +-
 protocols/Sametime/src/options.cpp      | 2 +-
 protocols/SkypeClassic/src/skype.cpp    | 2 +-
 protocols/SkypeClassic/src/skypeopt.cpp | 2 +-
 protocols/Tlen/src/tlen_opt.cpp         | 2 +-
 protocols/Tlen/src/tlen_thread.cpp      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'protocols')

diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index 1aa4c37c28..a377c2c827 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -85,7 +85,7 @@ static int icqProtoUninit(PROTO_INTERFACE* ppro)
 
 int ModuleLoad(WPARAM wParam, LPARAM lParam)
 {
-	bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);
+	bPopupService = ServiceExists(MS_POPUP_ADDPOPUPT);
 	return 0;
 }
 
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp
index 94fe71dc8e..87bac3d0a1 100644
--- a/protocols/MRA/src/MraPopUp.cpp
+++ b/protocols/MRA/src/MraPopUp.cpp
@@ -127,7 +127,7 @@ INT_PTR CALLBACK MraPopupDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, LPAR
 
 int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM lParam)
 {
-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
 		OPTIONSDIALOGPAGE odp = { sizeof(odp) };
 		odp.dwInitParam = (LPARAM)this;
 		odp.position = 100000000;
diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp
index ec2de559ea..fccb78c0e5 100644
--- a/protocols/Sametime/src/options.cpp
+++ b/protocols/Sametime/src/options.cpp
@@ -109,7 +109,7 @@ static INT_PTR CALLBACK DlgProcOptNet(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 			SetDlgItemInt(hwndDlg, IDC_ED_CLIENTID, proto->options.client_id, FALSE);
 		}
 
-		if (!ServiceExists(MS_POPUP_ADDPOPUP)) {
+		if (!ServiceExists(MS_POPUP_ADDPOPUPT)) {
 			HWND hw = GetDlgItem(hwndDlg, IDC_RAD_ERRPOP);
 			EnableWindow(hw, FALSE);
 		}
diff --git a/protocols/SkypeClassic/src/skype.cpp b/protocols/SkypeClassic/src/skype.cpp
index e8f7abbc01..bd65d1bae7 100644
--- a/protocols/SkypeClassic/src/skype.cpp
+++ b/protocols/SkypeClassic/src/skype.cpp
@@ -809,7 +809,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {
 	UNREFERENCED_PARAMETER(wParam);
 	UNREFERENCED_PARAMETER(lParam);
 
-	PopupServiceExists = ServiceExists(MS_POPUP_ADDPOPUP);
+	PopupServiceExists = ServiceExists(MS_POPUP_ADDPOPUPT);
 
 	logoff_contacts(FALSE);
 
diff --git a/protocols/SkypeClassic/src/skypeopt.cpp b/protocols/SkypeClassic/src/skypeopt.cpp
index a149fdaf74..16b421cdb4 100644
--- a/protocols/SkypeClassic/src/skypeopt.cpp
+++ b/protocols/SkypeClassic/src/skypeopt.cpp
@@ -461,7 +461,7 @@ INT_PTR CALLBACK OptionsAdvancedDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 			}
 
 #ifdef USEPOPUP
-			if (ServiceExists(MS_POPUP_ADDPOPUP))
+			if (ServiceExists(MS_POPUP_ADDPOPUPT))
 				CheckDlgButton(hwndDlg, IDC_USEPOPUP, (BYTE)db_get_b(NULL, SKYPE_PROTONAME, "UsePopup", 0));
 			else
 #endif
diff --git a/protocols/Tlen/src/tlen_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp
index 5d8a66af30..ad8645f2e1 100644
--- a/protocols/Tlen/src/tlen_opt.cpp
+++ b/protocols/Tlen/src/tlen_opt.cpp
@@ -574,7 +574,7 @@ static void MailPopupPreview(DWORD colorBack, DWORD colorText, char *title, char
 	ppd.colorBack = colorBack;
 	ppd.colorText = colorText;
 	ppd.iSeconds = delay;
-	if ( ServiceExists(MS_POPUP_ADDPOPUP))
+	if ( ServiceExists(MS_POPUP_ADDPOPUPT))
 		PUAddPopup(&ppd);
 }
 
diff --git a/protocols/Tlen/src/tlen_thread.cpp b/protocols/Tlen/src/tlen_thread.cpp
index 2a3d372186..563f328b32 100644
--- a/protocols/Tlen/src/tlen_thread.cpp
+++ b/protocols/Tlen/src/tlen_thread.cpp
@@ -1130,7 +1130,7 @@ static void TlenProcessM(XmlNode *node, ThreadData *info)
 
 static void TlenMailPopup(TlenProtocol *proto, char *title, char *emailInfo)
 {
-	if ( !ServiceExists(MS_POPUP_ADDPOPUP))
+	if ( !ServiceExists(MS_POPUP_ADDPOPUPT))
 		return;
 	if (!db_get_b(NULL, proto->m_szModuleName, "MailPopupEnabled", TRUE))
 		return;
-- 
cgit v1.2.3