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/YAPP/src/services.cpp | 2 +- plugins/YAPP/src/yapp.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/YAPP') 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); } -- cgit v1.2.3