Add Ctrl-w keybinding to close map window.

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

diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index 95fdabd441befc139ac3fb92cb28595816ffc9f5..26ceeee6a2f1c23a8ba60726fec41cb8298422ad 100644 (file)
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -23,6 +23,7 @@
 #include <sys/stat.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 
 #include <champlain/champlain.h>
 #include <champlain-gtk/champlain-gtk.h>
@@ -305,6 +306,21 @@ map_view_destroy_cb (GtkWidget *widget,
   g_slice_free (EmpathyMapView, window);
 }
 
+static gboolean
+map_view_key_press_cb (GtkWidget *widget,
+    GdkEventKey *event,
+    gpointer user_data)
+{
+  if (event->state & GDK_CONTROL_MASK
+      && event->keyval == GDK_w)
+    {
+      gtk_widget_destroy (widget);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 static gboolean
 map_view_tick (EmpathyMapView *window)
 {
@@ -352,6 +368,7 @@ empathy_map_view_show (void)
 
   empathy_builder_connect (gui, window,
       "map_view", "destroy", map_view_destroy_cb,
+      "map_view", "key-press-event", map_view_key_press_cb,
       "zoom_in", "clicked", map_view_zoom_in_cb,
       "zoom_out", "clicked", map_view_zoom_out_cb,
       "zoom_fit", "clicked", map_view_zoom_fit_cb,