evolution r34808 - in trunk/calendar: . gui

[msuman svn gnome org]

Author: msuman
Date: Mon Jan 14 07:44:26 2008
New Revision: 34808
URL: http://svn.gnome.org/viewvc/evolution?rev=34808&view=rev

Log:
Patch from Suresh Chandrasekharan  <suresh chandrasekharan sun com> Fix for bug #264404 (Pass down Enter if in preedit-mode)

Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/e-day-view.c
   trunk/calendar/gui/e-week-view.c

Modified: trunk/calendar/gui/e-day-view.c
==============================================================================
--- trunk/calendar/gui/e-day-view.c	(original)
+++ trunk/calendar/gui/e-day-view.c	Mon Jan 14 07:44:26 2008
@@ -7127,8 +7127,7 @@
 	switch (event->type) {
 	case GDK_KEY_PRESS:
 		tooltip_destroy (day_view, item);
-		if (event && event->key.keyval == GDK_Return) {
-			day_view->resize_event_num = -1;
+		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

Modified: trunk/calendar/gui/e-week-view.c
==============================================================================
--- trunk/calendar/gui/e-week-view.c	(original)
+++ trunk/calendar/gui/e-week-view.c	Mon Jan 14 07:44:26 2008
@@ -3061,7 +3061,7 @@
 	switch (gdkevent->type) {
 	case GDK_KEY_PRESS:
 		tooltip_destroy (week_view, item);
-		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));