diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-10-18 18:42:54 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-10-18 18:42:54 +0000 |
| commit | 7a4c68938789206bfec3c6d15cc4bb922daf6443 (patch) | |
| tree | e5f031fc609e50a8b7b12e7d6abf63cc78cc88e7 /tests/testtext.c | |
| parent | 7420908815651a1ff2ceb1c0fb5e92fe9b260619 (diff) | |
| download | gtk+-7a4c68938789206bfec3c6d15cc4bb922daf6443.tar.gz | |
Some updates
2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtk-sections.txt: Some updates
* gdk/gdk-sections.txt: remove GdkPixbufAlphaMode
* gdk-pixbuf/gdk-pixbuf-sections.txt: Add new API, remove
GdkPixbufClass/GdkAnimationClass since those are private
* gdk-pixbuf/Makefile.am (IGNORE_HFILES): ignore more headers
2000-10-18 Havoc Pennington <hp@redhat.com>
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): Fix a bug
where any number of empty lines would get skipped
* gtk/gtktextiter.h: Remove padding from GtkTextIter; live on the
edge.
* gtk/gtktextiter.c (gtk_text_iter_make_surreal): enhance the
warning about invalid iterators (explain more thoroughly)
(gtk_text_iter_in_region): rename gtk_text_iter_in_range
* gtk/gtktextview.c (FOCUS_EDGE_WIDTH): Make focus rectangle less
big
* demos/*.c: Add error handling
* gtk/gtktextbuffer.c: don't modify const iterators
* gtk/gdk-pixbuf-loader.c: Add full error handling here
* gtk/gtkimage.c (gtk_image_set_from_file): ignore errors
on file load
* gtk/gtkiconfactory.c: Update to reflect addition of error
handling to gdk-pixbuf loaders
2000-10-16 Havoc Pennington <hp@redhat.com>
* gdk-pixbuf-io.c (gdk_pixbuf_get_module)
(gdk_pixbuf_get_named_module) (gdk_pixbuf_load_module):
add error reporting here also
* make-inline-pixbuf.c (main): use GError
* io-xpm.c: include unistd.h
* gdk-pixbuf-util.c: include string.h
* io-*.c: add error reporting
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file): add
error reporting
* gdk-pixbuf-io.c (gdk_pixbuf_new_from_file): Add error reporting
* gdk-pixbuf-io.h: Add GError** to load_increment and load
methods
* gdk-pixbuf-io.c (gdk_pixbuf_save) (gdk_pixbuf_savev): return
a G_FILE_ERROR if we fail to write or close the file.
* gdk-pixbuf.h: remove GDK_PIXBUF_ERROR_IO, instead we'll use
G_FILE_ERROR_*. Rename enum to GdkPixbufError, properly following
the GError naming rules. Add GError** to load functions.
Diffstat (limited to 'tests/testtext.c')
| -rw-r--r-- | tests/testtext.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/tests/testtext.c b/tests/testtext.c index 16e7172b76..a362fd9be1 100644 --- a/tests/testtext.c +++ b/tests/testtext.c @@ -1299,8 +1299,6 @@ buffer_search_forward (Buffer *buffer, const char *str, { GtkTextIter iter; GtkTextIter start, end; - gint char_len; - int i = 0; GtkWidget *dialog; /* remove tag from whole buffer */ @@ -1313,22 +1311,17 @@ buffer_search_forward (Buffer *buffer, const char *str, "insert")); - char_len = g_utf8_strlen (str, -1); - - if (char_len > 0) + if (*str != '\0') { - while (gtk_text_iter_forward_search (&iter, str, TRUE, FALSE)) + GtkTextIter match_start, match_end; + + while (gtk_text_iter_forward_search (&iter, str, TRUE, FALSE, + &match_start, &match_end)) { - GtkTextIter end = iter; - - gtk_text_iter_forward_chars (&end, char_len); - gtk_text_buffer_apply_tag (buffer->buffer, buffer->found_text_tag, - &iter, &end); + &match_start, &match_end); - iter = end; - - ++i; + iter = match_end; } } |