Get rid of Popup (EnableDisableMenuCommand) vs. YAPP (ToggleEnabled) services madness

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

7 files changed, 8 insertions, 14 deletions

diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp
index 188e1ec57f..3be8c1a081 100644
--- a/plugins/BossKeyPlus/src/BossKey.cpp
+++ b/plugins/BossKeyPlus/src/BossKey.cpp
@@ -718,8 +718,6 @@ extern "C" int __declspec(dllexport) Load(void)
 	{

 		if (db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) == 0)

 			db_set_b(NULL, "Popup", "ModuleIsEnabled", 1);

-		if (db_get_b(NULL, "YAPP", "Enabled", 1) == 0)

-			db_set_b(NULL, "YAPP", "Enabled", 1);

 	}

 	if (g_wMaskAdv & OPT_HIDEONSTART && db_get_b(NULL, "Popup", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled

 	{

diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp
index c9283b3e5b..2ff75c3027 100644
--- a/plugins/PluginUpdater/src/DlgUpdate.cpp
+++ b/plugins/PluginUpdater/src/DlgUpdate.cpp
@@ -447,7 +447,7 @@ static void DlgUpdateSilent(void *lParam)
 		TCHAR tszTitle[100];

 		mir_sntprintf(tszTitle, SIZEOF(tszTitle), TranslateT("%d component(s) was updated"), UpdateFiles.getCount());		

 

-		if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, "YAPP", "Enabled", 1)) {

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

 			POPUPDATAT_V2 pd = { 0 };

 			pd.cbSize = sizeof(pd);

 			pd.lchContact = NULL;

diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp
index 031a4be96f..06b308d673 100644
--- a/plugins/PluginUpdater/src/Notifications.cpp
+++ b/plugins/PluginUpdater/src/Notifications.cpp
@@ -114,7 +114,7 @@ static void MakePopupAction(POPUPACTION &pa, int id)
 

 void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType, bool NoMessageBox)

 {	

-	if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, "YAPP", "Enabled", 1)) {

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

 		LPMSGPOPUPDATA	pmpd = (LPMSGPOPUPDATA)mir_alloc(sizeof(MSGPOPUPDATA));

 		if (!pmpd)

 			return;

diff --git a/plugins/StartupSilence/src/StartupSilence.h b/plugins/StartupSilence/src/StartupSilence.h
index 10514da85d..faa492e9a8 100644
--- a/plugins/StartupSilence/src/StartupSilence.h
+++ b/plugins/StartupSilence/src/StartupSilence.h
@@ -44,8 +44,7 @@ INT_PTR SilenceConnection(WPARAM wParam, LPARAM lParam);
 //lParam = 0 - not in use

 #define SS_SILENCE_CONNECTION "StartupSilence/SilenceConnection"

 

-#define POPUPONOFF "Popup/ToggleEnabled"

-#define POPUPONOFFPP "Popup/EnableDisableMenuCommand"

+#define POPUPONOFF "Popup/EnableDisableMenuCommand"

 

 #define MENU_NAME			LPGEN("Silence at startup")

 #define DISABLE_SILENCE		LPGEN("Toggle Silence OFF")

diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp
index 4578f5b1b5..d863ee46c3 100644
--- a/plugins/StartupSilence/src/main.cpp
+++ b/plugins/StartupSilence/src/main.cpp
@@ -153,10 +153,7 @@ int DisablePopup(WPARAM wParam, LPARAM lParam)
 

 void EnablePopupModule()

 {

-	if (ServiceExists(POPUPONOFFPP) && db_get_b(NULL,"Popup", "ModuleIsEnabled", 0) == 0) {

-		CallService(POPUPONOFFPP, NULL, NULL);

-	}

-	if (ServiceExists(POPUPONOFF) && db_get_b(NULL, "YAPP", "Enabled", 0) == 0) {

+	if (ServiceExists(POPUPONOFF) && db_get_b(NULL,"Popup", "ModuleIsEnabled", 0) == 0) {

 		CallService(POPUPONOFF, NULL, NULL);

 	}

 }

@@ -422,7 +419,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			break;

 

 		case IDC_DELAY2:

-			if (!(ServiceExists(POPUPONOFF) || ServiceExists(POPUPONOFFPP))) {

+			if (!ServiceExists(POPUPONOFF)) {

 				MessageBox(0, NEEDPOPUP, NOTICE, MB_OK);

 				CheckDlgButton(hwndDlg, IDC_DELAY2, BST_UNCHECKED);

 				PopUp = (BYTE)db_set_b(NULL, MODULE_NAME, PopUpComp, 0);

diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp
index 772b7aaff3..121f2b6d4d 100644
--- a/plugins/YAPP/src/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -433,7 +433,7 @@ void InitServices()
 	CreateServiceFunction(MS_POPUP_SHOWMESSAGE"W", ShowMessageW);

 

 	CreateServiceFunction(MS_POPUP_SHOWHISTORY, Popup_ShowHistory);

-	CreateServiceFunction("Popup/ToggleEnabled", TogglePopups);

+	CreateServiceFunction("Popup/EnableDisableMenuCommand", TogglePopups);

 }

 

 void DeinitServices()

diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp
index 9f7bb8ee2f..b7a64d9f4d 100644
--- a/plugins/YAPP/src/yapp.cpp
+++ b/plugins/YAPP/src/yapp.cpp
@@ -90,7 +90,7 @@ int IconsChanged(WPARAM, LPARAM)
 int TTBLoaded(WPARAM, LPARAM)

 {

 	TTBButton ttb = { sizeof(ttb) };

-	ttb.pszService = "Popup/ToggleEnabled";

+	ttb.pszService = "Popup/EnableDisableMenuCommand";

 	ttb.lParamUp = 1;

 	ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ASPUSHBUTTON;

 	if (db_get_b(0, "Popup", "ModuleIsEnabled", 1))

@@ -201,7 +201,7 @@ void InitMenuItems(void)
 	hMenuItemHistory = Menu_AddMainMenuItem(&mi);

 

 	mi.hIcon = IcoLib_GetIcon(isEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0);

-	mi.pszService = "Popup/ToggleEnabled";

+	mi.pszService = "Popup/EnableDisableMenuCommand";

 	mi.ptszName = (isEnabled ? LPGENT("Disable Popups") : LPGENT("Enable Popups"));

 	hMenuItem = Menu_AddMainMenuItem(&mi);

 }