From f508a7b7e2bdee84d29c10f8850857cdea8401c8 Mon Sep 17 00:00:00 2001 From: Joe Shaw Date: Tue, 22 May 2001 20:38:18 +0000 Subject: [PATCH] Simplify as suggested by Havoc. Just get the last iter and work backward 2001-05-22 Joe Shaw * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): Simplify as suggested by Havoc. Just get the last iter and work backward to the tag instead of getting a line and working back from there. Fixes passing in an invalid offset to iter_init_from_byte_offset(). --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtktextiter.c | 23 +++++------------------ 8 files changed, 61 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0df2c75948..103ce5aeb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2001-05-22 Joe Shaw + + * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): + Simplify as suggested by Havoc. Just get the last iter and work + backward to the tag instead of getting a line and working back from + there. Fixes passing in an invalid offset to + iter_init_from_byte_offset(). + Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0df2c75948..103ce5aeb2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2001-05-22 Joe Shaw + + * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): + Simplify as suggested by Havoc. Just get the last iter and work + backward to the tag instead of getting a line and working back from + there. Fixes passing in an invalid offset to + iter_init_from_byte_offset(). + Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0df2c75948..103ce5aeb2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2001-05-22 Joe Shaw + + * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): + Simplify as suggested by Havoc. Just get the last iter and work + backward to the tag instead of getting a line and working back from + there. Fixes passing in an invalid offset to + iter_init_from_byte_offset(). + Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0df2c75948..103ce5aeb2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2001-05-22 Joe Shaw + + * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): + Simplify as suggested by Havoc. Just get the last iter and work + backward to the tag instead of getting a line and working back from + there. Fixes passing in an invalid offset to + iter_init_from_byte_offset(). + Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0df2c75948..103ce5aeb2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2001-05-22 Joe Shaw + + * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): + Simplify as suggested by Havoc. Just get the last iter and work + backward to the tag instead of getting a line and working back from + there. Fixes passing in an invalid offset to + iter_init_from_byte_offset(). + Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0df2c75948..103ce5aeb2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2001-05-22 Joe Shaw + + * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): + Simplify as suggested by Havoc. Just get the last iter and work + backward to the tag instead of getting a line and working back from + there. Fixes passing in an invalid offset to + iter_init_from_byte_offset(). + Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0df2c75948..103ce5aeb2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2001-05-22 Joe Shaw + + * gtk/gtktextiter.c (_gtk_text_btree_get_iter_at_last_toggle): + Simplify as suggested by Havoc. Just get the last iter and work + backward to the tag instead of getting a line and working back from + there. Fixes passing in an invalid offset to + iter_init_from_byte_offset(). + Tue May 22 16:25:27 2001 Jonathan Blandford * gtk/gtktreeview*.h: diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index 1d53032146..253e104ac5 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -4832,27 +4832,14 @@ _gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree, GtkTextIter *iter, GtkTextTag *tag) { - GtkTextLine *line; - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (tree != NULL, FALSE); - line = _gtk_text_btree_last_could_contain_tag (tree, tag); - - if (line == NULL) - { - /* Set iter to first in tree */ - _gtk_text_btree_get_iter_at_line_char (tree, iter, 0, 0); - check_invariants (iter); - return FALSE; - } - else - { - iter_init_from_byte_offset (iter, tree, line, -1); - gtk_text_iter_backward_to_tag_toggle (iter, tag); - check_invariants (iter); - return TRUE; - } + _gtk_text_btree_get_end_iter (tree, iter); + gtk_text_iter_backward_to_tag_toggle (iter, tag); + check_invariants (iter); + + return TRUE; } gboolean -- GitLab