diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtktextiter.c | 8 |
8 files changed, 48 insertions, 2 deletions
@@ -1,3 +1,9 @@ +2001-12-31 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix + to use ensure_byte_offsets not ensure_char_offsets, patch + from Padraig O'Briain bug #67356 + 2001-12-30 Havoc Pennington <hp@pobox.com> * gtk/gtkdialog.h (GtkDialogFlags): fix GtkDialogFlags to have diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 576e4858b..7cc0af0ea 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +2001-12-31 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix + to use ensure_byte_offsets not ensure_char_offsets, patch + from Padraig O'Briain bug #67356 + 2001-12-30 Havoc Pennington <hp@pobox.com> * gtk/gtkdialog.h (GtkDialogFlags): fix GtkDialogFlags to have diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 576e4858b..7cc0af0ea 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2001-12-31 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix + to use ensure_byte_offsets not ensure_char_offsets, patch + from Padraig O'Briain bug #67356 + 2001-12-30 Havoc Pennington <hp@pobox.com> * gtk/gtkdialog.h (GtkDialogFlags): fix GtkDialogFlags to have diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 576e4858b..7cc0af0ea 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2001-12-31 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix + to use ensure_byte_offsets not ensure_char_offsets, patch + from Padraig O'Briain bug #67356 + 2001-12-30 Havoc Pennington <hp@pobox.com> * gtk/gtkdialog.h (GtkDialogFlags): fix GtkDialogFlags to have diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 576e4858b..7cc0af0ea 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2001-12-31 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix + to use ensure_byte_offsets not ensure_char_offsets, patch + from Padraig O'Briain bug #67356 + 2001-12-30 Havoc Pennington <hp@pobox.com> * gtk/gtkdialog.h (GtkDialogFlags): fix GtkDialogFlags to have diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 576e4858b..7cc0af0ea 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2001-12-31 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix + to use ensure_byte_offsets not ensure_char_offsets, patch + from Padraig O'Briain bug #67356 + 2001-12-30 Havoc Pennington <hp@pobox.com> * gtk/gtkdialog.h (GtkDialogFlags): fix GtkDialogFlags to have diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 576e4858b..7cc0af0ea 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2001-12-31 Havoc Pennington <hp@pobox.com> + + * gtk/gtktextiter.c (gtk_text_iter_get_visible_line_index): fix + to use ensure_byte_offsets not ensure_char_offsets, patch + from Padraig O'Briain bug #67356 + 2001-12-30 Havoc Pennington <hp@pobox.com> * gtk/gtkdialog.h (GtkDialogFlags): fix GtkDialogFlags to have diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index f28834f83..3399b8854 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -732,9 +732,11 @@ gtk_text_iter_get_visible_line_offset (const GtkTextIter *iter) ensure_char_offsets (real); check_invariants (iter); - + vis_offset = real->line_char_offset; + g_assert (vis_offset >= 0); + _gtk_text_btree_get_iter_at_line (real->tree, &pos, real->line, @@ -792,12 +794,14 @@ gtk_text_iter_get_visible_line_index (const GtkTextIter *iter) if (real == NULL) return 0; - ensure_char_offsets (real); + ensure_byte_offsets (real); check_invariants (iter); vis_offset = real->line_byte_offset; + g_assert (vis_offset >= 0); + _gtk_text_btree_get_iter_at_line (real->tree, &pos, real->line, |