From 600eb6308ae2ce5f7aeb40432f0aa7e8c8951611 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Mon, 15 Mar 2004 12:41:12 +0000 Subject: Fixes #48112 2004-03-15 Rodrigo Moya Fixes #48112 * gui/calendar-commands.c (calendar_control_sensitize_calendar_commands): disable the 'Delete' menu item on recurring meetings, since 'Delete all Occurrences' already deals with that. svn path=/trunk/; revision=25067 --- calendar/ChangeLog | 8 ++++++++ calendar/gui/calendar-commands.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 2601312fb9..9fb75ecca2 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-03-15 Rodrigo Moya + + Fixes #48112 + + * gui/calendar-commands.c (calendar_control_sensitize_calendar_commands): + disable the 'Delete' menu item on recurring meetings, since 'Delete all + Occurrences' already deals with that. + 2004-03-15 Rodrigo Moya Fixes #35577 diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c index efc33cf040..7c97374a87 100644 --- a/calendar/gui/calendar-commands.c +++ b/calendar/gui/calendar-commands.c @@ -536,9 +536,6 @@ calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalen bonobo_ui_component_set_prop (uic, "/commands/Paste", "sensitive", default_read_only ? "0" : "1", NULL); - bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive", - n_selected == 0 || selected_read_only ? "0" : "1", - NULL); /* occurrence-related menu items */ has_recurrences = FALSE; @@ -550,6 +547,9 @@ calendar_control_sensitize_calendar_commands (BonoboControl *control, GnomeCalen } } + bonobo_ui_component_set_prop (uic, "/commands/Delete", "sensitive", + n_selected == 0 || selected_read_only || has_recurrences ? "0" : "1", + NULL); bonobo_ui_component_set_prop (uic, "/commands/DeleteOccurrence", "sensitive", has_recurrences ? "1" : "0", NULL); -- cgit v1.2.3