Also allow Esc to close debug window and map view.

Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index b0bce622ffc94a5288f704b8806bbb4a9b352d5e..ee91939e6e5bb0dcafcc22223ea984b75656e4ee 100644 (file)
--- 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 26ceeee6a2f1c23a8ba60726fec41cb8298422ad..b7b37549f8cd9eb313aac944feba783d0949e8b1 100644 (file)
--- 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;