From 7abf768e7296a95e42f0fd31a5459e065ca921e6 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Wed, 21 Oct 2009 09:50:06 +0100 Subject: Also allow Esc to close debug window and map view. Signed-off-by: Jonny Lamb --- src/empathy-debug-window.c | 3 ++- src/empathy-map-view.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index b0bce622f..ee91939e6 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -1074,7 +1074,8 @@ debug_window_key_press_event_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if (event->state & GDK_CONTROL_MASK && event->keyval == GDK_w) + if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_w) + || event->keyval == GDK_Escape) { gtk_widget_destroy (widget); return TRUE; diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c index 26ceeee6a..b7b37549f 100644 --- a/src/empathy-map-view.c +++ b/src/empathy-map-view.c @@ -311,8 +311,8 @@ map_view_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data) { - if (event->state & GDK_CONTROL_MASK - && event->keyval == GDK_w) + if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_w) + || event->keyval == GDK_Escape) { gtk_widget_destroy (widget); return TRUE; -- cgit v1.2.3