[evolution] EMailBrowser: Cannot be closed with Escape key press
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] EMailBrowser: Cannot be closed with Escape key press
- Date: Tue, 10 Mar 2020 09:07:56 +0000 (UTC)
commit 243deddbe859354a490012bbeae7e9899a6d3e54
Author: Milan Crha <mcrha redhat com>
Date: Tue Mar 10 10:09:32 2020 +0100
EMailBrowser: Cannot be closed with Escape key press
This fixes a regression from commit a08523eea38f11b8a5fc2ba1d301b2605227e6bf.
src/mail/e-mail-browser.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/src/mail/e-mail-browser.c b/src/mail/e-mail-browser.c
index 086b85d800..29b370a0ff 100644
--- a/src/mail/e-mail-browser.c
+++ b/src/mail/e-mail-browser.c
@@ -467,7 +467,6 @@ mail_browser_key_press_event_cb (GtkWindow *mail_browser,
if (!event || (event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK | GDK_MOD1_MASK)) != 0 ||
event->keyval == GDK_KEY_Tab ||
event->keyval == GDK_KEY_Return ||
- event->keyval == GDK_KEY_Escape ||
event->keyval == GDK_KEY_KP_Tab ||
event->keyval == GDK_KEY_KP_Enter)
return event && e_mail_display_need_key_event (mail_display, event);
@@ -477,7 +476,7 @@ mail_browser_key_press_event_cb (GtkWindow *mail_browser,
if (focused && (GTK_IS_ENTRY (focused) || GTK_IS_EDITABLE (focused) ||
(GTK_IS_TREE_VIEW (focused) && gtk_tree_view_get_search_column (GTK_TREE_VIEW (focused)) >= 0))) {
gtk_widget_event (focused, (GdkEvent *) event);
- return TRUE;
+ return event->keyval != GDK_KEY_Escape;
}
if (e_web_view_get_need_input (E_WEB_VIEW (mail_display)) &&
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]