[empathy] Also allow Esc to close debug window and map view.

[Jonny Lamb <jonnylamb src gnome org>]

commit 7abf768e7296a95e42f0fd31a5459e065ca921e6
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Wed Oct 21 09:50:06 2009 +0100

    Also allow Esc to close debug window and map view.
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 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 b0bce62..ee91939 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 26ceeee..b7b3754 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;