From 2fb994ca2316a5aae08d74f008a70da5452a279e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 12 Jul 2000 23:51:21 +0000 Subject: [PATCH] sync --- gtk/gtktextbtree.c | 2 +- gtk/gtktextbuffer.c | 2 +- gtk/gtktextiter.c | 10 +++++----- gtk/gtktextiter.h | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 77d2be7fce..95571322af 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -1508,7 +1508,7 @@ gtk_text_btree_tag (const GtkTextIter *start_orig, iter = start; /* We don't want to delete a toggle that's at the start iterator. */ gtk_text_iter_next_char(&iter); - while (gtk_text_iter_forward_find_tag_toggle(&iter, tag)) + while (gtk_text_iter_forward_to_tag_toggle(&iter, tag)) { if (gtk_text_iter_compare(&iter, &end) >= 0) break; diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c index 732f650edc..e2d6c78fe9 100644 --- a/gtk/gtktextbuffer.c +++ b/gtk/gtktextbuffer.c @@ -549,7 +549,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer, gboolean done = FALSE; GtkTextIter end; - gtk_text_iter_forward_find_tag_toggle (&iter, NULL); + gtk_text_iter_forward_to_tag_toggle (&iter, NULL); gtk_text_buffer_get_iter_at_mark (buffer, &end, end_mark); diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index e9e43099e7..085b12185a 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -1915,8 +1915,8 @@ gtk_text_iter_forward_to_newline(GtkTextIter *iter) } gboolean -gtk_text_iter_forward_find_tag_toggle (GtkTextIter *iter, - GtkTextTag *tag) +gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter, + GtkTextTag *tag) { GtkTextLine *next_line; GtkTextLine *current_line; @@ -1982,8 +1982,8 @@ gtk_text_iter_forward_find_tag_toggle (GtkTextIter *iter, } gboolean -gtk_text_iter_backward_find_tag_toggle (GtkTextIter *iter, - GtkTextTag *tag) +gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter, + GtkTextTag *tag) { g_warning("FIXME"); @@ -2466,7 +2466,7 @@ gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree *tree, else { iter_init_from_byte_offset(iter, tree, line, 0); - gtk_text_iter_forward_find_tag_toggle(iter, tag); + gtk_text_iter_forward_to_tag_toggle(iter, tag); check_invariants(iter); return TRUE; } diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h index 772b70ee0b..450ffc4cfd 100644 --- a/gtk/gtktextiter.h +++ b/gtk/gtktextiter.h @@ -146,11 +146,11 @@ gboolean gtk_text_iter_forward_to_newline (GtkTextIter *iter); /* returns TRUE if a toggle was found; NULL for the tag pointer means "any tag toggle", otherwise the next toggle of the specified tag is located. */ -gboolean gtk_text_iter_forward_find_tag_toggle (GtkTextIter *iter, - GtkTextTag *tag); +gboolean gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter, + GtkTextTag *tag); -gboolean gtk_text_iter_backward_find_tag_toggle (GtkTextIter *iter, - GtkTextTag *tag); +gboolean gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter, + GtkTextTag *tag); typedef gboolean (* GtkTextCharPredicate) (gunichar ch, gpointer user_data);