Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1802
diff -u -r1.1802 ChangeLog
--- ChangeLog	25 Jun 2003 16:08:55 -0000	1.1802
+++ ChangeLog	26 Jun 2003 08:12:40 -0000
@@ -1,3 +1,10 @@
+2003-06-26  Bolian Yin <bolian.yin@sun.com>
+
+	Fixes #45276
+
+	* gui/e-day-view.c (e_day_view_on_text_item_event): set focus to dayview when editing is canceled.
+	* gui/e-week-view.c (e_week_view_on_text_item_event): set focus to weekview when editing is canceled
+
 2003-06-25  Bolian Yin <bolian.yin@sun.com>
 
 	Fixes #45275
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.198
diff -u -r1.198 e-day-view.c
--- gui/e-day-view.c	25 Jun 2003 15:53:54 -0000	1.198
+++ gui/e-day-view.c	26 Jun 2003 08:13:06 -0000
@@ -6392,6 +6392,8 @@
 		} else if (event->key.keyval == GDK_Escape) {
 			cancel_editing (day_view);
 			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+			/* focus should go to day view when stop editing */
+			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 			return TRUE;
 		}
 		break;
Index: gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.165
diff -u -r1.165 e-week-view.c
--- gui/e-week-view.c	19 Jun 2003 02:41:49 -0000	1.165
+++ gui/e-week-view.c	26 Jun 2003 08:13:27 -0000
@@ -3108,6 +3108,8 @@
 		} else if (gdkevent->key.keyval == GDK_Escape) {
 			cancel_editing (week_view);
 			gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+			/* focus should go to week view when stop editing */
+			gtk_widget_grab_focus (GTK_WIDGET (week_view));
 			return TRUE;
 		}
 		break;
