Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2498
diff -u -r1.2498 ChangeLog
--- ChangeLog	27 Aug 2004 18:10:22 -0000	1.2498
+++ ChangeLog	27 Aug 2004 18:28:14 -0000
@@ -1,3 +1,12 @@
+2004-08-27  Suresh Chandrasekharan <suresh.chandrasekharan@sun.com>
+
+	Fixes #64404
+
+	* gui/e-day-view.c (e_day_view_on_text_item_event): Pass down
+	Enter if in  preedit-mode.
+
+	* gui/e-week-view.c (e_week_view_on_text_item_event): -do-
+
 2004-08-27  JP Rosevear  <jpr@novell.com>
 
 	Fixes #62911, #54101
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.252
diff -u -r1.252 e-day-view.c
--- gui/e-day-view.c	2 Aug 2004 07:33:38 -0000	1.252
+++ gui/e-day-view.c	27 Aug 2004 18:28:14 -0000
@@ -5663,7 +5663,7 @@
 {
 	switch (event->type) {
 	case GDK_KEY_PRESS:
-		if (event && event->key.keyval == GDK_Return) {
+		if (!E_TEXT (item)->preedit_len && event && event->key.keyval == GDK_Return) {
 			day_view->resize_event_num = -1;
 
 			/* We set the keyboard focus to the EDayView, so the
Index: gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.222
diff -u -r1.222 e-week-view.c
--- gui/e-week-view.c	2 Aug 2004 07:33:38 -0000	1.222
+++ gui/e-week-view.c	27 Aug 2004 18:28:15 -0000
@@ -2977,7 +2977,7 @@
 
 	switch (gdkevent->type) {
 	case GDK_KEY_PRESS:
-		if (gdkevent && gdkevent->key.keyval == GDK_Return) {
+		if ( !E_TEXT (item)->preedit_len  && gdkevent && gdkevent->key.keyval == GDK_Return) {
 			/* We set the keyboard focus to the EDayView, so the
 			   EText item loses it and stops the edit. */
 			gtk_widget_grab_focus (GTK_WIDGET (week_view));
