diff options
author | Kristian Rietveld <kris@gtk.org> | 2005-07-19 21:06:50 +0000 |
---|---|---|
committer | Kristian Rietveld <kristian@src.gnome.org> | 2005-07-19 21:06:50 +0000 |
commit | 91f2fb2d4d3b8f5474121a396c1b191938ad3887 (patch) | |
tree | 931ecfbb95266a6313620a44fca8419d6ec32996 | |
parent | 410e79f22f15a156ff00d421ff98c544452c9413 (diff) | |
download | gtk+-91f2fb2d4d3b8f5474121a396c1b191938ad3887.tar.gz |
don't iterate past the end of the string, so pango_layout_get_cursor_pos()
2005-07-19 Kristian Rietveld <kris@gtk.org>
* gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate
past the end of the string, so pango_layout_get_cursor_pos() won't
complain. (#309211, Tommi Komulainen).
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
-rw-r--r-- | gtk/gtkentry.c | 2 |
4 files changed, 19 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2005-07-19 Kristian Rietveld <kris@gtk.org> + + * gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate + past the end of the string, so pango_layout_get_cursor_pos() won't + complain. (#309211, Tommi Komulainen). + 2005-07-18 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b8d47dfee3..3b39a52d7a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2005-07-19 Kristian Rietveld <kris@gtk.org> + + * gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate + past the end of the string, so pango_layout_get_cursor_pos() won't + complain. (#309211, Tommi Komulainen). + 2005-07-18 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b8d47dfee3..3b39a52d7a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2005-07-19 Kristian Rietveld <kris@gtk.org> + + * gtk/gtkentry.c (gtk_entry_move_forward_word): don't iterate + past the end of the string, so pango_layout_get_cursor_pos() won't + complain. (#309211, Tommi Komulainen). + 2005-07-18 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 0061fc1fa3..5c48de21da 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -3553,7 +3553,7 @@ gtk_entry_move_forward_word (GtkEntry *entry, /* Find the next word end */ new_pos++; - while (new_pos < n_attrs && !log_attrs[new_pos].is_word_end) + while (new_pos < n_attrs - 1 && !log_attrs[new_pos].is_word_end) new_pos++; g_free (log_attrs); |