remove the completion timeout when the user pressed on Enter/ESC. Fixes

Mon Oct 20 23:24:27 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkentry.c (gtk_entry_key_press): remove the completion
	timeout when the user pressed on Enter/ESC. Fixes the bug where the
	completion popup popped up after the user pressed on Enter (which is
	just weird). Reported by the Epiphany people (all of them).

ChangeLog

+Mon Oct 20 23:24:27 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_key_press): remove the completion
+	timeout when the user pressed on Enter/ESC. Fixes the bug where the
+	completion popup popped up after the user pressed on Enter (which is
+	just weird). Reported by the Epiphany people (all of them).
+
 Mon Oct 20 20:27:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Add support for OS X like sliding of toolbar items during drag and

ChangeLog.pre-2-10

+Mon Oct 20 23:24:27 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_key_press): remove the completion
+	timeout when the user pressed on Enter/ESC. Fixes the bug where the
+	completion popup popped up after the user pressed on Enter (which is
+	just weird). Reported by the Epiphany people (all of them).
+
 Mon Oct 20 20:27:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Add support for OS X like sliding of toolbar items during drag and

ChangeLog.pre-2-4

+Mon Oct 20 23:24:27 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_key_press): remove the completion
+	timeout when the user pressed on Enter/ESC. Fixes the bug where the
+	completion popup popped up after the user pressed on Enter (which is
+	just weird). Reported by the Epiphany people (all of them).
+
 Mon Oct 20 20:27:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Add support for OS X like sliding of toolbar items during drag and

ChangeLog.pre-2-6

+Mon Oct 20 23:24:27 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_key_press): remove the completion
+	timeout when the user pressed on Enter/ESC. Fixes the bug where the
+	completion popup popped up after the user pressed on Enter (which is
+	just weird). Reported by the Epiphany people (all of them).
+
 Mon Oct 20 20:27:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Add support for OS X like sliding of toolbar items during drag and

ChangeLog.pre-2-8

+Mon Oct 20 23:24:27 2003  Kristian Rietveld  <kris@gtk.org>
+
+	* gtk/gtkentry.c (gtk_entry_key_press): remove the completion
+	timeout when the user pressed on Enter/ESC. Fixes the bug where the
+	completion popup popped up after the user pressed on Enter (which is
+	just weird). Reported by the Epiphany people (all of them).
+
 Mon Oct 20 20:27:22 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
 	Add support for OS X like sliding of toolbar items during drag and

gtk/gtkentry.c

@@ -1622,6 +1622,18 @@ gtk_entry_key_press (GtkWidget   *widget,
 	}
     }
 
+  if (event->keyval == GDK_Return || event->keyval == GDK_ISO_Enter
+      || event->keyval == GDK_Escape)
+    {
+      GtkEntryCompletion *completion = gtk_entry_get_completion (entry);
+
+      if (completion && completion->priv->completion_timeout)
+        {
+          g_source_remove (completion->priv->completion_timeout);
+          completion->priv->completion_timeout = 0;
+        }
+    }
+
   if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
     /* Activate key bindings
      */