Pulling stuff up from the branch

2001-02-06  JP Rosevear  <jpr@ximian.com>

	* cal-util/cal-component.c (cal_component_set_categories): If the
	categories string is empty, remove the property
	(get_period_list): Fixes from clahey to handle the new rdate
	format in libical
	(set_period_list): ditto

2001-02-06  JP Rosevear  <jpr@ximian.com>

	* gui/event-editor.c (fill_reminder_widgets): Match new
	append_alarm signature
	(reminder_to_comp_object): only add alarms tagged as new, no
	longer delete all alarms first
	(append_reminder): the row data is now of type ReminderData,
	rename from append_alarm
	(reminder_add_cb): math new append_alarm signature
	(reminder_delete_cb): if the alarm existed before the dialog was
	loaded, delete it immediately from the cal component

2001-02-06  JP Rosevear  <jpr@ximian.com>

	* gui/event-editor-dialog.glade: Gui tweaks for bugs 1248 and 1246

	* gui/dialogs/task-editor-dialog.glade: ditto

2001-02-06  JP Rosevear  <jpr@ximian.com>

	* gui/e-week-view.c (e_week_view_show_popup_menu): Make the menus more
	consistent

	* gui/e-day-view.c (e_day_view_on_event_right_click): ditto

	* gui/e-calendar-table.c: ditto

svn path=/trunk/; revision=8037

1 files changed, 14 insertions, 7 deletions

diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 50f86989ee..b84ce99157 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -3010,17 +3010,24 @@ e_day_view_on_event_right_click (EDayView *day_view,
 	static struct menu_item child_items[] = {
 		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Delete this appointment"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
+
+		{ NULL, NULL, NULL, TRUE},
+		
 		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
 	};
 
 	static struct menu_item recur_child_items[] = {
-		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Make this appointment movable"), (GtkSignalFunc) e_day_view_on_unrecur_appointment, NULL, TRUE },
+
+		{ NULL, NULL, NULL, TRUE},
+
+		{ N_("Edit this appointment..."), (GtkSignalFunc) e_day_view_on_edit_appointment, NULL, TRUE },
 		{ N_("Delete this occurrence"), (GtkSignalFunc) e_day_view_on_delete_occurrence, NULL, TRUE },
 		{ N_("Delete all occurrences"), (GtkSignalFunc) e_day_view_on_delete_appointment, NULL, TRUE },
-		{ NULL, NULL, NULL, TRUE },
-		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE }
+
+		{ NULL, NULL, NULL, TRUE},
+
+		{ N_("New appointment..."), (GtkSignalFunc) e_day_view_on_new_appointment, NULL, TRUE },
 	};
 
 	have_selection = GTK_WIDGET_HAS_FOCUS (day_view)
@@ -3044,13 +3051,13 @@ e_day_view_on_event_right_click (EDayView *day_view,
 		not_being_edited = TRUE;
 
 		if (cal_component_has_recurrences (event->comp)) {
-			items = 6;
+			items = 7;
 			context_menu = &recur_child_items[0];
 			context_menu[0].sensitive = not_being_edited;
-			context_menu[1].sensitive = not_being_edited;
 			context_menu[2].sensitive = not_being_edited;
 			context_menu[3].sensitive = not_being_edited;
-			context_menu[5].sensitive = have_selection;
+			context_menu[4].sensitive = not_being_edited;
+			context_menu[6].sensitive = have_selection;
 		} else {
 			items = 4;
 			context_menu = &child_items[0];