From: Jonathan Blandford <jrb@redhat.com>
Date: Tue, 16 Mar 2004 19:03:17 +0000 (+0000)
Subject: Block the ::changed handler during the ::match-selected when done by
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=14582ece472521d01e25feb1b55db607d588188b

Block the ::changed handler during the ::match-selected when done by

Tue Mar 16 13:54:07 2004  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtkentry.c (gtk_entry_completion_key_press): Block the
        ::changed handler during the ::match-selected when done by
        keyboard.
---

diff --git a/ChangeLog b/ChangeLog
index 9cfed65a7..260f98599 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 16 13:54:07 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_completion_key_press): Block the
+	::changed handler during the ::match-selected when done by
+	keyboard.
+
 Tue Mar 16 00:56:11 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_list_button_press): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9cfed65a7..260f98599 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Mar 16 13:54:07 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_completion_key_press): Block the
+	::changed handler during the ::match-selected when done by
+	keyboard.
+
 Tue Mar 16 00:56:11 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_list_button_press): 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9cfed65a7..260f98599 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Mar 16 13:54:07 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_completion_key_press): Block the
+	::changed handler during the ::match-selected when done by
+	keyboard.
+
 Tue Mar 16 00:56:11 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_list_button_press): 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9cfed65a7..260f98599 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Mar 16 13:54:07 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_completion_key_press): Block the
+	::changed handler during the ::match-selected when done by
+	keyboard.
+
 Tue Mar 16 00:56:11 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_list_button_press): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9cfed65a7..260f98599 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Mar 16 13:54:07 2004  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtkentry.c (gtk_entry_completion_key_press): Block the
+	::changed handler during the ::match-selected when done by
+	keyboard.
+
 Tue Mar 16 00:56:11 2004  Matthias Clasen  <maclas@gmx.de>
 
 	* gtk/gtkentrycompletion.c (gtk_entry_completion_list_button_press): 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 2ef7b50a4..3f0c4f441 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4812,8 +4812,12 @@ gtk_entry_completion_key_press (GtkWidget   *widget,
           if (!gtk_tree_selection_get_selected (sel, &model, &iter))
             return FALSE;
 
+	  g_signal_handler_block (completion->priv->entry,
+				  completion->priv->changed_id);
           g_signal_emit_by_name (completion, "match_selected",
                                  model, &iter, &entry_set);
+	  g_signal_handler_unblock (completion->priv->entry,
+				    completion->priv->changed_id);
 
           if (!entry_set)
             {