aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/calendar-commands.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 2601312fb9..9fb75ecca2 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
2004-03-15 Rodrigo Moya <rodrigo@ximian.com>
+ 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 <rodrigo@ximian.com>
+
Fixes #35577
* gui/e-cal-view.c (e_calendar_view_delete_selected_occurrence):
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);