I overlooked an if when I was adding the signal block/unblock code. Oops.
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org> * gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when I was adding the signal block/unblock code. Oops. (Noticed by Marco Pesenti Gritti).
This commit is contained in:

committed by
Kristian Rietveld

parent
9607ba378a
commit
f84b5d512b
@ -1,3 +1,9 @@
|
|||||||
|
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
|
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
|
||||||
|
I was adding the signal block/unblock code. Oops. (Noticed by
|
||||||
|
Marco Pesenti Gritti).
|
||||||
|
|
||||||
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
|
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
|
||||||
|
I was adding the signal block/unblock code. Oops. (Noticed by
|
||||||
|
Marco Pesenti Gritti).
|
||||||
|
|
||||||
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
|
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
|
||||||
|
I was adding the signal block/unblock code. Oops. (Noticed by
|
||||||
|
Marco Pesenti Gritti).
|
||||||
|
|
||||||
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
|
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
|
||||||
|
I was adding the signal block/unblock code. Oops. (Noticed by
|
||||||
|
Marco Pesenti Gritti).
|
||||||
|
|
||||||
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
Mon Oct 13 20:21:38 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
|
* gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
|
||||||
|
I was adding the signal block/unblock code. Oops. (Noticed by
|
||||||
|
Marco Pesenti Gritti).
|
||||||
|
|
||||||
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
Mon Oct 13 20:21:55 2003 Kristian Rietveld <kris@gtk.org>
|
||||||
|
|
||||||
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
|
||||||
|
@ -3452,16 +3452,16 @@ gtk_entry_set_text (GtkEntry *entry,
|
|||||||
g_return_if_fail (GTK_IS_ENTRY (entry));
|
g_return_if_fail (GTK_IS_ENTRY (entry));
|
||||||
g_return_if_fail (text != NULL);
|
g_return_if_fail (text != NULL);
|
||||||
|
|
||||||
completion = gtk_entry_get_completion (entry);
|
|
||||||
if (completion)
|
|
||||||
g_signal_handler_block (entry, completion->priv->changed_id);
|
|
||||||
|
|
||||||
/* Actually setting the text will affect the cursor and selection;
|
/* Actually setting the text will affect the cursor and selection;
|
||||||
* if the contents don't actually change, this will look odd to the user.
|
* if the contents don't actually change, this will look odd to the user.
|
||||||
*/
|
*/
|
||||||
if (strcmp (entry->text, text) == 0)
|
if (strcmp (entry->text, text) == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
completion = gtk_entry_get_completion (entry);
|
||||||
|
if (completion)
|
||||||
|
g_signal_handler_block (entry, completion->priv->changed_id);
|
||||||
|
|
||||||
gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1);
|
gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1);
|
||||||
|
|
||||||
tmp_pos = 0;
|
tmp_pos = 0;
|
||||||
|
Reference in New Issue
Block a user