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 9cfed65a76b56f55053e2068ac11acfef0c19cd3..260f98599fb0d41cdcea1842e1dac059b49968df 100644 (file)
--- 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 9cfed65a76b56f55053e2068ac11acfef0c19cd3..260f98599fb0d41cdcea1842e1dac059b49968df 100644 (file)
--- 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 9cfed65a76b56f55053e2068ac11acfef0c19cd3..260f98599fb0d41cdcea1842e1dac059b49968df 100644 (file)
--- 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 9cfed65a76b56f55053e2068ac11acfef0c19cd3..260f98599fb0d41cdcea1842e1dac059b49968df 100644 (file)
--- 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 9cfed65a76b56f55053e2068ac11acfef0c19cd3..260f98599fb0d41cdcea1842e1dac059b49968df 100644 (file)
--- 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 2ef7b50a49777b78b6dfadc135924390addcceb5..3f0c4f441ef1db2ea05bcd415b21a93ac2b95338 100644 (file)
--- 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)
             {