aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2009-10-21 16:50:06 +0800
committerJonny Lamb <jonnylamb@gnome.org>2009-10-21 16:50:06 +0800
commit7abf768e7296a95e42f0fd31a5459e065ca921e6 (patch)
tree0b9f06c041b56a57b855ae0ce1fe5a751f033089
parent1aacf68f38e8169d9753b1e1f25d2613437f7611 (diff)
downloadgsoc2013-empathy-7abf768e7296a95e42f0fd31a5459e065ca921e6.tar
gsoc2013-empathy-7abf768e7296a95e42f0fd31a5459e065ca921e6.tar.gz
gsoc2013-empathy-7abf768e7296a95e42f0fd31a5459e065ca921e6.tar.bz2
gsoc2013-empathy-7abf768e7296a95e42f0fd31a5459e065ca921e6.tar.lz
gsoc2013-empathy-7abf768e7296a95e42f0fd31a5459e065ca921e6.tar.xz
gsoc2013-empathy-7abf768e7296a95e42f0fd31a5459e065ca921e6.tar.zst
gsoc2013-empathy-7abf768e7296a95e42f0fd31a5459e065ca921e6.zip
Also allow Esc to close debug window and map view.
Signed-off-by: Jonny Lamb <jonnylamb@gnome.org>
-rw-r--r--src/empathy-debug-window.c3
-rw-r--r--src/empathy-map-view.c4
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;