From 88790eed4ffd9ca555c8f9b73cb014a93b57a34f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 22 Jun 2015 20:38:56 +0000
Subject: Menu_ModifyItem unbound from CLISTMENUITEM structure

git-svn-id: http://svn.miranda-ng.org/main/trunk@14334 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Alarms/src/frame.cpp   | 16 ++++------------
 plugins/Alarms/src/options.cpp |  1 -
 2 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'plugins/Alarms')

diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp
index e3ff863496..c82ce4e96c 100644
--- a/plugins/Alarms/src/frame.cpp
+++ b/plugins/Alarms/src/frame.cpp
@@ -448,20 +448,13 @@ int ReloadFont(WPARAM, LPARAM)
 
 void FixMainMenu()
 {
-	CLISTMENUITEM mi = { 0 };
 	if (!ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) {
 		if (options.hide_with_clist || options.auto_showhide)
-			mi.flags = CMIM_FLAGS | CMIF_GRAYED;
-		else {
-			mi.flags = CMIM_NAME | CMIM_FLAGS;
-
-			if (ReminderFrameVisible())
-				mi.pszName = Translate("Hide reminders");
-			else
-				mi.pszName = Translate("Show reminders");
-		}
+			Menu_ModifyItem(hMenuShowReminders, NULL, INVALID_HANDLE_VALUE, CMIF_GRAYED);
+		else
+			Menu_ModifyItem(hMenuShowReminders,
+				ReminderFrameVisible() ? LPGENT("Hide reminders") : LPGENT("Show reminders"), INVALID_HANDLE_VALUE, 0);
 	}
-	Menu_ModifyItem(hMenuShowReminders, &mi);
 }
 
 /////////////////////////
@@ -549,7 +542,6 @@ int CreateFrame()
 		CreateServiceFunction(MODULE "/ShowHideReminders", ShowHideMenuFunc);
 
 		CLISTMENUITEM mi = { 0 };
-		mi.flags = CMIM_ALL;
 		mi.hIcon = hIconMenuShowHide;
 		mi.pszName = LPGEN("Show reminders");
 		mi.pszService = MODULE "/ShowHideReminders";
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp
index 58106e397e..b4fbbc4f18 100644
--- a/plugins/Alarms/src/options.cpp
+++ b/plugins/Alarms/src/options.cpp
@@ -693,7 +693,6 @@ void AddMenuItem()
 	if (hMainMenuItem) return;
 
 	CLISTMENUITEM mi = { 0 };
-	mi.flags = CMIM_ALL;
 	mi.icolibItem = IcoLib_GetIconHandle("alarms_menu_set");
 	mi.pszName = "Set alarm";
 	mi.pszService = MODULE "/NewAlarm";
-- 
cgit v1.2.3