[evolution/gnome-3-26] Bug 792480 - Delete key press should not create new event in Calendar views

[Milan Crha <mcrha src gnome org>]

commit b69a21533aff00c31423751a0517337f1cb48dae
Author: Milan Crha <mcrha redhat com>
Date:   Tue Jan 16 09:52:55 2018 +0100

    Bug 792480 - Delete key press should not create new event in Calendar views

 src/calendar/gui/e-day-view.c  |    7 ++++---
 src/calendar/gui/e-week-view.c |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/src/calendar/gui/e-day-view.c b/src/calendar/gui/e-day-view.c
index d9e7ceb..fc73010 100644
--- a/src/calendar/gui/e-day-view.c
+++ b/src/calendar/gui/e-day-view.c
@@ -6438,7 +6438,9 @@ e_day_view_do_key_press (GtkWidget *widget,
              && (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
             || (event->length == 0)
             || (keyval == GDK_KEY_Tab)
-            || (keyval == GDK_KEY_Escape))) {
+            || (keyval == GDK_KEY_Escape)
+            || (keyval == GDK_KEY_Delete)
+            || (keyval == GDK_KEY_KP_Delete))) {
                return FALSE;
        }
 
@@ -7174,8 +7176,7 @@ e_day_view_start_editing_event (EDayView *day_view,
        if (key_event) {
                if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) {
                        ((EText *)(event->canvas_item))->need_im_reset = TRUE;
-               }
-               else {
+               } else if (key_event->keyval != GDK_KEY_Return && key_event->keyval != GDK_KEY_KP_Enter) {
                        gchar *initial_text;
 
                        initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval, 
key_event->string);
diff --git a/src/calendar/gui/e-week-view.c b/src/calendar/gui/e-week-view.c
index 917580e..80df8f2 100644
--- a/src/calendar/gui/e-week-view.c
+++ b/src/calendar/gui/e-week-view.c
@@ -4964,7 +4964,9 @@ e_week_view_do_key_press (GtkWidget *widget,
                    && (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)))
                   || (event->length == 0)
                   || (event->keyval == GDK_KEY_Tab)
-                  || (event->keyval == GDK_KEY_Escape)) {
+                  || (event->keyval == GDK_KEY_Escape)
+                  || (event->keyval == GDK_KEY_Delete)
+                  || (event->keyval == GDK_KEY_KP_Delete)) {
                return FALSE;
        } else
                initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string);