summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristian Rietveld <kris@gtk.org>2003-10-13 18:23:54 +0000
committerKristian Rietveld <kristian@src.gnome.org>2003-10-13 18:23:54 +0000
commitf84b5d512b8e6e84c467fd1dadb9bc2f65a9353b (patch)
tree18a10bfee942bc000e0145731b40ce4de500fd66
parent9607ba378aaed61e138660ccf6dbe95d4f275de7 (diff)
downloadgdk-pixbuf-f84b5d512b8e6e84c467fd1dadb9bc2f65a9353b.tar.gz
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).
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-46
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--gtk/gtkentry.c8
6 files changed, 34 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b116a1a3b..900053411 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b116a1a3b..900053411 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b116a1a3b..900053411 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b116a1a3b..900053411 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b116a1a3b..900053411 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
* demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 215748e00..7385b991d 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3452,16 +3452,16 @@ gtk_entry_set_text (GtkEntry *entry,
g_return_if_fail (GTK_IS_ENTRY (entry));
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;
* if the contents don't actually change, this will look odd to the user.
*/
if (strcmp (entry->text, text) == 0)
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);
tmp_pos = 0;