aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/table/e-cell-combo.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2007-11-05 20:11:08 +0800
committerMilan Crha <mcrha@src.gnome.org>2007-11-05 20:11:08 +0800
commitf1f54e0cdd88678ab083ee129ec37fe9509490e5 (patch)
treed9fca89aad7dee9125762183f7bd4731a1c89299 /widgets/table/e-cell-combo.c
parent3724efa492414cbe3d372cd50b733fea599d6510 (diff)
downloadgsoc2013-evolution-f1f54e0cdd88678ab083ee129ec37fe9509490e5.tar.gz
gsoc2013-evolution-f1f54e0cdd88678ab083ee129ec37fe9509490e5.tar.zst
gsoc2013-evolution-f1f54e0cdd88678ab083ee129ec37fe9509490e5.zip
** Fix for bug #255051
2007-11-05 Milan Crha <mcrha@redhat.com> ** Fix for bug #255051 * e-cell-combo.c: (e_cell_combo_key_press): * e-cell-text.c: (ect_event): Pass Escape event to parent, if there is no action to do with it. * e-table-click-to-add.c: (etcta_event): Drop changes when pressed Escape and go back to default line with text "Click to add...". svn path=/trunk/; revision=34507
Diffstat (limited to 'widgets/table/e-cell-combo.c')
-rw-r--r--widgets/table/e-cell-combo.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index bd13848148..764a2c2031 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -628,6 +628,9 @@ e_cell_combo_key_press (GtkWidget *popup_window,
&& event->keyval != GDK_3270_Enter)
return FALSE;
+ if (event->keyval == GDK_Escape && (!ecc->popup_window||!GTK_WIDGET_VISIBLE (ecc->popup_window)))
+ return FALSE;
+
gtk_grab_remove (ecc->popup_window);
gdk_pointer_ungrab (event->time);
gdk_keyboard_ungrab (event->time);