correct ServiceExists call for popups

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

3 files changed, 12 insertions, 12 deletions

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);

 		}