Escape to cancel from status editing

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

svn path=/trunk/; revision=2776

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 702379a7cfeab8c6fa6ce586b14ed1c5e73cb085..11ee4f1b9d2f5ecedecf8347e8d5710cacf440d6 100644 (file)
--- 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 <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>
 
 #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);
 }
 
        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)
 {
 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, "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;
        // 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 214e31e16f4f95db3d53d41975f89023f46c1a42..6c0ddb2502b39b0b43b6dac6e9ee9688740348d5 100644 (file)
--- 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);
 
 
        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);
 
                          G_CALLBACK (status_icon_key_press_event_cb),
                          icon);