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).

diff --git a/ChangeLog b/ChangeLog
index 4ec6b36843bef8541a39760c68e81497a1f35f16..9974cde183298dc6bd000fa9b2445495319c44c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4ec6b36843bef8541a39760c68e81497a1f35f16..9974cde183298dc6bd000fa9b2445495319c44c1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,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

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 4ec6b36843bef8541a39760c68e81497a1f35f16..9974cde183298dc6bd000fa9b2445495319c44c1 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4ec6b36843bef8541a39760c68e81497a1f35f16..9974cde183298dc6bd000fa9b2445495319c44c1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4ec6b36843bef8541a39760c68e81497a1f35f16..9974cde183298dc6bd000fa9b2445495319c44c1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,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

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 7576d72872a1790e134d5e3e3d66286c37163347..3e97af9f82abc95e5de4e256bb92071c71d11d2b 100644 (file)
--- a/gtk/gtkentry.c
+++ b/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
      */