correct ServiceExists call for popups

git-svn-id: http://svn.miranda-ng.org/main/trunk@9435 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

32 files changed, 51 insertions, 51 deletions

diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp
index b8faea47a1..4c0f08039a 100644
--- a/plugins/Alarms/src/alarmlist.cpp
+++ b/plugins/Alarms/src/alarmlist.cpp
@@ -501,7 +501,7 @@ static LRESULT CALLBACK PopupAlarmDlgProc(HWND hWnd, UINT message, WPARAM wParam
 

 void ShowPopup(ALARM *alarm)

 {

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		ALARM *data = new ALARM;

 		memset(data, 0, sizeof(ALARM));

 		copy_alarm_data(data, alarm);

@@ -547,7 +547,7 @@ void DoAlarm(ALARM *alarm)
 			}

 		}

 		if (alarm->action & AAF_POPUP) {

-			if (options.use_popup_module && ServiceExists(MS_POPUP_ADDPOPUP)) 

+			if (options.use_popup_module && ServiceExists(MS_POPUP_ADDPOPUPT)) 

 				ShowPopup(alarm);

 			else {

 				HWND hwndDlg = CreateDialog(hInst, MAKEINTRESOURCE(IDD_ALARM), GetDesktopWindow(), DlgProcAlarm);

diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp
index d3da911958..cbe83b4e09 100644
--- a/plugins/Alarms/src/options.cpp
+++ b/plugins/Alarms/src/options.cpp
@@ -828,7 +828,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 				EnableWindow(hw, FALSE);

 			}

 

-			if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+			if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 				CheckDlgButton(hwndDlg, IDC_CHK_POPUPS, temp_options.use_popup_module ? TRUE : FALSE);

 				if (options.use_popup_module) {

 					HWND hw = GetDlgItem(hwndDlg, IDC_CHK_LOOPSOUND);

@@ -1104,7 +1104,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			int reminder_period = GetDlgItemInt(hwndDlg, IDC_ED_PERIOD, &translated, FALSE);

 			if (translated) temp_options.reminder_period = reminder_period;

 

-			if ( !ServiceExists(MS_POPUP_ADDPOPUP) || !options.use_popup_module)

+			if ( !ServiceExists(MS_POPUP_ADDPOPUPT) || !options.use_popup_module)

 				temp_options.loop_sound = IsDlgButtonChecked(hwndDlg, IDC_CHK_LOOPSOUND) ? true : false;

 

 			options = temp_options;

diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp
index 7fe24fdf46..fc4a51d40e 100644
--- a/plugins/BuddyExpectator/src/options.cpp
+++ b/plugins/BuddyExpectator/src/options.cpp
@@ -95,7 +95,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 

-		if ( !ServiceExists(MS_POPUP_ADDPOPUP))

+		if ( !ServiceExists(MS_POPUP_ADDPOPUPT))

 			EnableWindow(GetDlgItem(hwndDlg, IDC_CHECK_POPUP), FALSE);

 

 		//iAbsencePeriod

@@ -441,7 +441,7 @@ static int OptionsInit(WPARAM wParam, LPARAM lParam)
 	odp.flags       = ODPF_BOLDGROUPS|ODPF_TCHAR;

 	Options_AddPage(wParam, &odp);

 

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.ptszGroup   = LPGENT("Popups");

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPPANEL);

 		odp.pfnDlgProc  = PopupOptionsFrameProc;

diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
index dfd8c6217a..5033843923 100644
--- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp
+++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp
@@ -74,7 +74,7 @@ void WritePopupOptions()
 

 void RegPopupActions()

 {

-	if (ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		poOptions.paActions[0].cbSize = sizeof(POPUPACTION);

 		strcpy(poOptions.paActions[0].lpzTitle, ModuleName);

 		strcat(poOptions.paActions[0].lpzTitle, "/Copy to clipboard");

@@ -161,7 +161,7 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM lParam)
 	odp.pfnDlgProc = DlgMainProcOptions;

 	Options_AddPage(wParam, &odp);

 

-	if (ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPTION_FORM);

 		odp.pszGroup = LPGEN("Popups");

 		odp.pfnDlgProc = DlgPopupsProcOptions;

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 3929feb23a..2aaa9463b2 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -368,7 +368,7 @@ INT_PTR CALLBACK CCNErrorDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
 

 static int ModuleLoad(WPARAM wParam, LPARAM lParam)

 {

-	bPopupExists = ServiceExists(MS_POPUP_ADDPOPUP);

+	bPopupExists = ServiceExists(MS_POPUP_ADDPOPUPT);

 	bFingerprintExists = ServiceExists(MS_FP_SAMECLIENTST) && ServiceExists(MS_FP_GETCLIENTICONT);

 	bVariablesExists = ServiceExists(MS_VARS_FORMATSTRING);

 	return 0;

diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp
index fefff1f7b6..1afbda79aa 100644
--- a/plugins/Db_autobackups/src/options.cpp
+++ b/plugins/Db_autobackups/src/options.cpp
@@ -121,7 +121,7 @@ int SetDlgState(HWND hwndDlg)
 	CheckDlgButton(hwndDlg, IDC_CHK_NOPROG, new_options.disable_progress ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(hwndDlg, IDC_CHK_NOPOPUP, new_options.disable_popups ? BST_CHECKED : BST_UNCHECKED);

 	CheckDlgButton(hwndDlg, IDC_CHK_USEZIP, new_options.use_zip ? BST_CHECKED : BST_UNCHECKED);

-	if ( !ServiceExists(MS_POPUP_ADDPOPUP))

+	if ( !ServiceExists(MS_POPUP_ADDPOPUPT))

 		ShowWindow(GetDlgItem(hwndDlg, IDC_CHK_NOPOPUP), SW_HIDE);

 

 	return 0;

diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp
index cc337564d5..ed10225453 100644
--- a/plugins/Exchange/src/dlg_handlers.cpp
+++ b/plugins/Exchange/src/dlg_handlers.cpp
@@ -58,7 +58,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
 

 			SetDlgItemInt(hWnd, IDC_RECONNECT_INTERVAL, db_get_dw(NULL, ModuleName, "ReconnectInterval", DEFAULT_RECONNECT_INTERVAL), FALSE);

 			CheckDlgButton(hWnd, IDC_USE_POPUPS, (BOOL) db_get_b(NULL, ModuleName, "UsePopups", 0) ? BST_CHECKED : BST_UNCHECKED);

-			EnableWindow(GetDlgItem(hWnd, IDC_USE_POPUPS), ServiceExists(MS_POPUP_ADDPOPUP)); //disable the popups checkbox if no popup module is present

+			EnableWindow(GetDlgItem(hWnd, IDC_USE_POPUPS), ServiceExists(MS_POPUP_ADDPOPUPT)); //disable the popups checkbox if no popup module is present

 

 			CheckDlgButton(hWnd, IDC_CHECK_EMAILS, (bCheck) ? BST_CHECKED : BST_UNCHECKED);

 			EnableWindow(GetDlgItem(hWnd, IDC_INTERVAL_EDIT), bCheck);

diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp
index 5dcd52d1d8..696c595b02 100644
--- a/plugins/Exchange/src/emails.cpp
+++ b/plugins/Exchange/src/emails.cpp
@@ -293,7 +293,7 @@ int CExchangeServer::Check(int bNoEmailsNotify)
 

 int ShowMessage(TCHAR *message, int cUnreadEmails)

 {

-	int usePopups = ServiceExists(MS_POPUP_ADDPOPUP) ? db_get_b(NULL, ModuleName, "UsePopups", 0) : 0;

+	int usePopups = ServiceExists(MS_POPUP_ADDPOPUPT) ? db_get_b(NULL, ModuleName, "UsePopups", 0) : 0;

 	if (usePopups)

 		return ShowPopupMessage(TranslateT("Exchange email"), message, cUnreadEmails);

 

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 46a1ab65e3..7adfafe758 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -955,7 +955,7 @@ static int ContactWindowOpen(WPARAM wparam, LPARAM lParam)
 

 static int ModuleLoad(WPARAM wParam, LPARAM lParam)

 {

-	bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);

+	bPopupService = ServiceExists(MS_POPUP_ADDPOPUPT);

 	return 0;

 }

 

diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp
index 62f893c7cb..b7e5872860 100644
--- a/plugins/MsgPopup/src/main.cpp
+++ b/plugins/MsgPopup/src/main.cpp
@@ -199,7 +199,7 @@ int HookedInit(WPARAM wParam, LPARAM lParam)
 

 int HookedOptions(WPARAM wParam, LPARAM lParam)

 {

-	if (ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 		odp.hInstance = hInst;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp
index 1ac8b3eb2f..b103da1e8d 100644
--- a/plugins/NewEventNotify/src/options.cpp
+++ b/plugins/NewEventNotify/src/options.cpp
@@ -288,7 +288,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, L
 

 int OptionsAdd(HINSTANCE hInst, WPARAM addInfo)

 {

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 		odp.hInstance = hInst;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 26886b1404..081f7e9ec0 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -1073,7 +1073,7 @@ void InitMainMenuItem()
 {

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.flags = CMIF_TCHAR;

-	mi.ptszPopupName = ServiceExists(MS_POPUP_ADDPOPUP) ? _T("Popups") : NULL;

+	mi.ptszPopupName = ServiceExists(MS_POPUP_ADDPOPUPT) ? _T("Popups") : NULL;

 	mi.pszService = MS_STATUSCHANGE_MENUCOMMAND;

 	hEnableDisableMenu = Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index f1693ab8be..e7b3d3b9ba 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -1043,7 +1043,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = DlgProcXLogOpts;

 	Options_AddPage(wParam, &odp);

 

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTitle = LPGEN("Status Notify");

 		odp.pszGroup = LPGEN("Popups");

 		odp.pszTab = LPGEN("General");

diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp
index acbd27badf..8b41c0eee3 100644
--- a/plugins/PackUpdater/Src/Notifications.cpp
+++ b/plugins/PackUpdater/Src/Notifications.cpp
@@ -176,7 +176,7 @@ INT_PTR CALLBACK DlgDownloadPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 static void __stdcall CreateDownloadDialog(void*)

 {

-	if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups3", DEFAULT_POPUP_ENABLED))

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups3", DEFAULT_POPUP_ENABLED))

 		hDlgDld = CreateDialog(hInst, MAKEINTRESOURCE(IDD_POPUPDUMMI), NULL, DlgDownloadPop);

 	else if (db_get_b(NULL,MODNAME, "Popups3M", DEFAULT_MESSAGE_ENABLED)) {

 		lstrcpyn(tszDialogMsg, Text, SIZEOF(tszDialogMsg));

@@ -195,7 +195,7 @@ void DlgDownloadProc()
 	if (!DownloadFile(pFileUrl->tszDownloadURL, pFileUrl->tszDiskPath)) {

 		Title = TranslateT("Pack Updater");

 		Text = TranslateT("An error occurred while downloading the update.");

-		if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

+		if ( ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

 			Number = 1;

 			show_popup(0, Title, Text, Number, 0);

 		}

@@ -420,7 +420,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 						INT rc = -1;

 						Title = TranslateT("Pack Updater");

 						Text = tszBuff;

-						if (ServiceExists(MS_POPUP_ADDPOPUP) && ServiceExists(MS_POPUP_REGISTERACTIONS) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups0", DEFAULT_POPUP_ENABLED) && (db_get_dw(NULL, "Popup", "Actions", 0) & 1))

+						if (ServiceExists(MS_POPUP_ADDPOPUPT) && ServiceExists(MS_POPUP_REGISTERACTIONS) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups0", DEFAULT_POPUP_ENABLED) && (db_get_dw(NULL, "Popup", "Actions", 0) & 1))

 							rc = DialogBox(hInst, MAKEINTRESOURCE(IDD_POPUPDUMMI), NULL, DlgMsgPop);

 						else

 							rc = MessageBox(NULL, tszBuff, Title, MB_YESNO | MB_ICONQUESTION);

@@ -508,7 +508,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam
 							mir_sntprintf(tszBuff, SIZEOF(tszBuff), TranslateT("You have chosen not to install the pack update immediately.\nYou can install it manually from this location:\n\n%s"), arFilePath[0].c_str());

 							Title = TranslateT("Pack Updater");

 							Text = tszBuff;

-							if (ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

+							if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

 								Number = 2;

 								show_popup(0, Title, Text, Number, 0);

 							}

diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp
index 0ad1cd2599..f064dfeac6 100644
--- a/plugins/PackUpdater/Src/Options.cpp
+++ b/plugins/PackUpdater/Src/Options.cpp
@@ -55,7 +55,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 		ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_PERIODMEASURE), PeriodMeasure);

 

 		CheckDlgButton(hwndDlg, IDC_REMINDER, (int)Reminder);

-		if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+		if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 			ShowWindow(GetDlgItem(hwndDlg, IDC_NOTIFY2), SW_HIDE);

 			ShowWindow(GetDlgItem(hwndDlg, IDC_MSG_BOXES2), SW_HIDE);

 			ShowWindow(GetDlgItem(hwndDlg, IDC_ERRORS2), SW_HIDE);

@@ -146,7 +146,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 				db_set_b(NULL, MODNAME, "PeriodMeasure", PeriodMeasure);

 				Reminder = IsDlgButtonChecked(hwndDlg, IDC_REMINDER);

 				db_set_b(NULL, MODNAME, "Reminder", Reminder);

-				if ( !ServiceExists(MS_POPUP_ADDPOPUP)) {

+				if ( !ServiceExists(MS_POPUP_ADDPOPUPT)) {

 					for (int i = 1; i < POPUPS; i++) {

 						mir_snprintf(str, SIZEOF(str), "Popups%dM", i);

 						db_set_b(NULL, MODNAME, str, (BYTE)(IsDlgButtonChecked(hwndDlg, (i+1029))));

@@ -395,7 +395,7 @@ int OptInit(WPARAM wParam, LPARAM lParam)
 	odp.pfnDlgProc = UpdateNotifyOptsProc;

 	Options_AddPage(wParam, &odp);

 

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);

 		odp.ptszGroup = LPGENT("Popups");

 		odp.ptszTitle = LPGENT("Pack Updater");

diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp
index b6d7ec0eec..49d13a9f6d 100644
--- a/plugins/PackUpdater/Src/Utils.cpp
+++ b/plugins/PackUpdater/Src/Utils.cpp
@@ -199,7 +199,7 @@ static void CheckUpdates(void *)
 	if (lstrcmp(dbVar.ptszVal, NULL) == 0) { // URL is not set

 		Title=TranslateT("Pack Updater");

 		Text = TranslateT("URL for checking updates not found.");

-		if (ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

+		if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

 			Number = 1;

 			show_popup(0, Title, Text, Number, 0);

 		}

@@ -259,7 +259,7 @@ static void CheckUpdates(void *)
 		if (_tcsstr(tszBuff, _T("\\"))) { //check update name

 			Title = TranslateT("Pack Updater");

 			Text = TranslateT("Name of Update's file is not supported.");

-			if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

+			if ( ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {

 				Number = 1;

 				show_popup(0, Title, Text, Number, 0);

 			}

@@ -356,7 +356,7 @@ static void CheckUpdates(void *)
 	if (!UpdatesCount && !Silent) {

 		Title = TranslateT("Pack Updater");

 		Text = TranslateT("No updates found.");

-		if (ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

+		if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

 			Number = 2;

 			show_popup(0, Title, Text, Number, 0);

 		}

@@ -367,7 +367,7 @@ static void CheckUpdates(void *)
 	if (!FileCount) {

 		Title = TranslateT("Pack Updater");

 		Text = TranslateT("No files for update.");

-		if (ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

+		if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

 			Number = 2;

 			show_popup(0, Title, Text, Number, 0);

 		}

@@ -382,7 +382,7 @@ void DoCheck(int iFlag)
 	if (hCheckThread != NULL) {

 		Title = TranslateT("Pack Updater");

 		Text = TranslateT("Update checking already started!");

-		if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

+		if ( ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) &&  db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED)) {

 			Number = 2;

 			show_popup(0, Title, Text, Number, 0);

 		}

diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp
index ff86820cf3..aae9592534 100644
--- a/plugins/PluginUpdater/src/Options.cpp
+++ b/plugins/PluginUpdater/src/Options.cpp
@@ -400,7 +400,7 @@ int OptInit(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = UpdateNotifyOptsProc;

 	Options_AddPage(wParam, &odp);

 

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);

 		odp.ptszGroup = LPGENT("Popups");

 		odp.ptszTitle = LPGENT("Plugin Updater");

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 997243ea5a..8bc0593254 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -430,7 +430,7 @@ int StatusIconPressed(WPARAM wParam, LPARAM lParam)
 static int ModuleLoad(WPARAM wParam, LPARAM lParam)

 {

 	g_dat.smileyAddInstalled = ServiceExists(MS_SMILEYADD_SHOWSELECTION) && ServiceExists(MS_SMILEYADD_REPLACESMILEYS);

-	g_dat.popupInstalled = ServiceExists(MS_POPUP_ADDPOPUP);

+	g_dat.popupInstalled = ServiceExists(MS_POPUP_ADDPOPUPT);

 	g_dat.ieviewInstalled = ServiceExists(MS_IEVIEW_WINDOW);

 	return 0;

 }

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 2822625fbd..0b144fe738 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -127,7 +127,7 @@ extern "C" __declspec(dllexport) int __cdecl Unload()
 

 int ModuleLoad(WPARAM, LPARAM)

 {

-	bPopupExists = ServiceExists(MS_POPUP_ADDPOPUP);

+	bPopupExists = ServiceExists(MS_POPUP_ADDPOPUPT);

 	return 0;

 }

 

diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 782b4ba403..58f5f8819e 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -127,7 +127,7 @@ extern "C" __declspec(dllexport) int Load(void)
 
 int hook_ModulesLoaded(WPARAM, LPARAM)
 {
-	myGlobals.PopupExist		= ServiceExists(MS_POPUP_ADDPOPUP);
+	myGlobals.PopupExist		= ServiceExists(MS_POPUP_ADDPOPUPT);
 	myGlobals.PopupActionsExist	= ServiceExists(MS_POPUP_REGISTERACTIONS);
 	myGlobals.PluginHTTPExist	= ServiceExists(MS_HTTP_ACCEPT_CONNECTIONS);
 	myGlobals.PluginFTPExist	= ServiceExists(MS_FTPFILE_SHAREFILE);
diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp
index c68ef2cdd0..169abca395 100644
--- a/plugins/Spamotron/src/options.cpp
+++ b/plugins/Spamotron/src/options.cpp
@@ -580,7 +580,7 @@ int OnOptInitialize(WPARAM wParam, LPARAM lParam)
 	odp.pfnDlgProc = DlgProcOptionsBayes;

 	Options_AddPage(wParam, &odp);

 

-	if (ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_POPUPS);

 		odp.pfnDlgProc = DlgProcOptionsPopups;

 		odp.ptszGroup = LPGENT("Popups");

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 41dee6ec7c..25dd21b9ee 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -894,7 +894,7 @@ static int ProcessPopup(int reason, LPARAM lParam)
 	HICON hIcon = NULL;

 	TCHAR text[MAX_SECONDLINE];

 

-	if ( !db_get_b(NULL, MODULENAME, SETTING_SHOWCONNECTIONPOPUPS,FALSE) || !ServiceExists(MS_POPUP_ADDPOPUP))

+	if ( !db_get_b(NULL, MODULENAME, SETTING_SHOWCONNECTIONPOPUPS,FALSE) || !ServiceExists(MS_POPUP_ADDPOPUPT))

 		return -1;

 

 	switch(reason) {

diff --git a/plugins/StatusPlugins/KeepStatus/options.cpp b/plugins/StatusPlugins/KeepStatus/options.cpp
index c3a282da57..eb2cff358b 100644
--- a/plugins/StatusPlugins/KeepStatus/options.cpp
+++ b/plugins/StatusPlugins/KeepStatus/options.cpp
@@ -390,14 +390,14 @@ INT_PTR CALLBACK PopupOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lPar
 			break;

 		}

 		// delay

-		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAYCUSTOM), ServiceExists(MS_POPUP_ADDPOPUP));

-		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAYFROMPU), ServiceExists(MS_POPUP_ADDPOPUP));

-		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAYPERMANENT), ServiceExists(MS_POPUP_ADDPOPUP));

-		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY), ServiceExists(MS_POPUP_ADDPOPUP));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAYCUSTOM), ServiceExists(MS_POPUP_ADDPOPUPT));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAYFROMPU), ServiceExists(MS_POPUP_ADDPOPUPT));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAYPERMANENT), ServiceExists(MS_POPUP_ADDPOPUPT));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY), ServiceExists(MS_POPUP_ADDPOPUPT));

 		switch ( db_get_b(NULL, MODULENAME, SETTING_POPUP_DELAYTYPE, POPUP_DELAYFROMPU)) {

 		case POPUP_DELAYCUSTOM:

 			CheckDlgButton(hwndDlg, IDC_DELAYCUSTOM, BST_CHECKED);

-			EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY), ServiceExists(MS_POPUP_ADDPOPUP));

+			EnableWindow(GetDlgItem(hwndDlg, IDC_DELAY), ServiceExists(MS_POPUP_ADDPOPUPT));

 			break;

 

 		case POPUP_DELAYPERMANENT:

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 760718eb43..5fdf1e1724 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -140,7 +140,7 @@ void CGlobals::reloadSystemModulesChanged()
 

 	bMetaEnabled = abs(M.GetByte(META_PROTO, "Enabled", -1));

 

-	g_PopupAvail = ServiceExists(MS_POPUP_ADDPOPUP);

+	g_PopupAvail = ServiceExists(MS_POPUP_ADDPOPUPT);

 

 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = -2000090000;

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 7bc3a6bbc2..2983bc1e22 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1289,7 +1289,7 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam)
 	odp.pfnDlgProc = DlgProcTypeOptions;

 	Options_AddPage(wParam, &odp);

 

-	if (ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if (ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPT);

 		odp.pszTitle    = LPGEN("Event notifications");

 		odp.pszGroup    = LPGEN("Popups");

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index b8bc21d693..2a697ce0c5 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -503,7 +503,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 int TN_OptionsInitialize(WPARAM wParam, LPARAM lParam)

 {

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 		odp.position = 100000000;

 		odp.hInstance = g_hInst;

diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp
index a1eb20272c..9db8c5dd71 100644
--- a/plugins/TrafficCounter/src/TrafficCounter.cpp
+++ b/plugins/TrafficCounter/src/TrafficCounter.cpp
@@ -181,7 +181,7 @@ int TrafficCounterShutdown(WPARAM wParam, LPARAM lParam)
 

 int ModuleLoad(WPARAM wParam, LPARAM lParam)

 {

-	bPopupExists = ServiceExists(MS_POPUP_ADDPOPUP);

+	bPopupExists = ServiceExists(MS_POPUP_ADDPOPUPT);

 	bVariablesExists = ServiceExists(MS_VARS_FORMATSTRING) && ServiceExists(MS_VARS_REGISTERTOKEN);

 	bTooltipExists = ServiceExists("mToolTip/ShowTipW") || ServiceExists("mToolTip/ShowTip");

 	return 0;

diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp
index 19fdc8e55d..3329dcfe3a 100644
--- a/plugins/WebView/src/webview.cpp
+++ b/plugins/WebView/src/webview.cpp
@@ -313,7 +313,7 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam)
 	Options_AddPage(wParam, &odp);

 

 	// if popup service exists

-	if ((ServiceExists(MS_POPUP_ADDPOPUP))) {

+	if ((ServiceExists(MS_POPUP_ADDPOPUPT))) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);

 		odp.ptszGroup = LPGENT("Popups");

 		odp.pfnDlgProc = DlgPopUpOpts;

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index 2b9c921b6b..435ea79bc4 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -191,7 +191,7 @@ int PopupAlert(WPARAM hContact, LPARAM lParam)
 	ppd.PluginWindowProc = NULL;

 	ppd.iSeconds = db_get_dw(NULL, MODULENAME, POP_DELAY_KEY, 0);

 

-	if (ServiceExists(MS_POPUP_ADDPOPUP))

+	if (ServiceExists(MS_POPUP_ADDPOPUPT))

 		CallService(MS_POPUP_ADDPOPUP, (WPARAM)&ppd, 0);

 

 	return 0;

diff --git a/plugins/WebView/src/webview_opts.cpp b/plugins/WebView/src/webview_opts.cpp
index f49ca27613..9e7149908e 100644
--- a/plugins/WebView/src/webview_opts.cpp
+++ b/plugins/WebView/src/webview_opts.cpp
@@ -1145,11 +1145,11 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			}

 			else {

 				CheckDlgButton(hwndDlg, IDC_SUPPRESS, BST_UNCHECKED);

-				if ((ServiceExists(MS_POPUP_ADDPOPUP) != 0))

+				if ((ServiceExists(MS_POPUP_ADDPOPUPT) != 0))

 					EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 1);

 			}

 

-			if (ServiceExists(MS_POPUP_ADDPOPUP) == 0)

+			if (ServiceExists(MS_POPUP_ADDPOPUPT) == 0)

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), 0);

 

 			if ( db_get_b(NULL, MODULENAME, UPDATE_ONSTART_KEY, 0)) {

@@ -1222,7 +1222,7 @@ INT_PTR CALLBACK DlgProcOpt(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 			break;

 

 		case IDC_SUPPRESS:

-			if ((ServiceExists(MS_POPUP_ADDPOPUP) != 0))

+			if ((ServiceExists(MS_POPUP_ADDPOPUPT) != 0))

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ERROR_POPUP), (!(IsDlgButtonChecked(hwndDlg, IDC_SUPPRESS))));

 			break;

 

diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp
index e73dff7f16..7331cf93f7 100644
--- a/plugins/WhenWasIt/src/dlg_handlers.cpp
+++ b/plugins/WhenWasIt/src/dlg_handlers.cpp
@@ -217,7 +217,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
 			CheckDlgButton(hWnd, IDC_USE_DIALOG, (commonData.bUseDialog) ? BST_CHECKED : BST_UNCHECKED);

 			EnableDialogGroup(hWnd, commonData.bUseDialog);

 

-			if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+			if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 				CheckDlgButton(hWnd, IDC_USE_POPUPS, commonData.bUsePopups ? BST_CHECKED : BST_UNCHECKED);

 				EnablePopupsGroup(hWnd, commonData.bUsePopups);

 			}

diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
index f14411fb25..3cdc5c7c54 100644
--- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
@@ -183,7 +183,7 @@ int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam)
 	odp.pfnDlgProc = DlgProcPluginOpt;

 	Options_AddPage(wParam, &odp);

 

-	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

+	if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {

 		odp.pszGroup = LPGEN("Popups");

 		odp.pszTab = LPGEN("YAMN");

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTPOPUP);