aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/e-day-view.c3
-rw-r--r--calendar/gui/e-week-view.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index cb5743e3b3..9e90ed1ea1 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -7127,8 +7127,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
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
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index c7004cbbd1..b6254750a9 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3061,7 +3061,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
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));