From 20051a55a8a7cb710767e09b0a5e6e2a0445c0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Fri, 30 May 2014 11:53:57 +0000 Subject: 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 --- plugins/StartupSilence/src/StartupSilence.h | 3 +-- plugins/StartupSilence/src/main.cpp | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'plugins/StartupSilence') 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); -- cgit v1.2.3