From 7ff5340a076a91f70ae8ba7a1a40b78d9fe89b1d Mon Sep 17 00:00:00 2001
From: Davyd Madeley <davyd@madeley.id.au>
Date: Fri, 10 Apr 2009 16:53:39 +0000
Subject: [PATCH] Escape to cancel from status editing

From: Davyd Madeley <davyd@madeley.id.au>

svn path=/trunk/; revision=2776
---
 libempathy-gtk/empathy-presence-chooser.c | 23 +++++++++++++++++++++++
 src/empathy-status-icon.c                 |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 702379a7..11ee4f1b 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -30,6 +30,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
+#include <gdk/gdkkeysyms.h>
 
 #include <telepathy-glib/util.h>
 #include <libmissioncontrol/mc-enum-types.h>
@@ -296,6 +297,25 @@ entry_activate_cb (EmpathyPresenceChooser	*self,
 	mc_set_custom_state (self);
 }
 
+static gboolean
+entry_key_press_event_cb (EmpathyPresenceChooser	*self,
+		          GdkEventKey			*event,
+			  GtkWidget			*entry)
+{
+	EmpathyPresenceChooserPriv *priv = GET_PRIV (self);
+
+	if (priv->editing_status && event->keyval == GDK_Escape)
+	{
+		/* the user pressed Escape, undo the editing */
+		set_status_editing (self, FALSE);
+		presence_chooser_presence_changed_cb (self);
+
+		return TRUE;
+	}
+
+	return FALSE; /* send this event elsewhere */
+}
+
 static void
 changed_cb (GtkComboBox *self, gpointer user_data)
 {
@@ -376,6 +396,9 @@ empathy_presence_chooser_init (EmpathyPresenceChooser *chooser)
 	g_signal_connect_object (entry, "activate",
 			G_CALLBACK (entry_activate_cb), chooser,
 			G_CONNECT_SWAPPED);
+	g_signal_connect_object (entry, "key-press-event",
+			G_CALLBACK (entry_key_press_event_cb), chooser,
+			G_CONNECT_SWAPPED);
 	// FIXME - should this also happen when the user presses TAB ?
 
 	GtkCellRenderer *renderer;
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 214e31e1..6c0ddb25 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -589,7 +589,7 @@ empathy_status_icon_new (GtkWindow *window, gboolean hide_contact_list)
 
 	priv->window = g_object_ref (window);
 
-	g_signal_connect (priv->window, "key-press-event",
+	g_signal_connect_after (priv->window, "key-press-event",
 			  G_CALLBACK (status_icon_key_press_event_cb),
 			  icon);
 
-- 
2.39.2