diff options
| author | Havoc Pennington <hp@redhat.com> | 2000-12-14 23:26:59 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2000-12-14 23:26:59 +0000 |
| commit | 94ec8cff934d0d5559d6474131b3682e943bbc8e (patch) | |
| tree | 1e28209981e5b72a75bd7e49f88f0f673e3a6e29 /gtk/testtext.c | |
| parent | 2e70f892ccf120947b4ab34a968ca4818208211d (diff) | |
| download | gdk-pixbuf-94ec8cff934d0d5559d6474131b3682e943bbc8e.tar.gz | |
remove unused call to get_last_line()
2000-12-14 Havoc Pennington <hp@redhat.com>
* gtk/gtktextbtree.c (_gtk_text_btree_validate_line): remove
unused call to get_last_line()
* gtk/gtkobject.c (gtk_object_add_arg_type): add G_TYPE_POINTER
here until boxed is working (and maybe after that - we should
really not gratuitously break old code)
* gtk/gtktexttag.c (gtk_text_tag_class_init): add commented-out
specific types for font_desc and tabs args, move them to
GTK_TYPE_POINTER for now, waiting on g_param_spec_boxed() to get
fixed. Move GdkColor args to GTK_TYPE_POINTER also.
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): temporarily
use GTK_TYPE_POINTER for signal signatures as a hack-around
* gtk/gtk-boxed.defs: Add boxed types for PangoFontDescription and
PangoTabArray
* gtk/gtktextlayout.c (line_display_iter_to_index):
make static
(line_display_index_to_iter): make static
* gtk/gtktextbuffer.c (gtk_text_buffer_class_init): fix marshaller
to marshal a string not a boxed
* gtk/gtkmarshal.list: add marshaller for GtkTextBuffer:insert_text
* gtk/testtext.c (fill_file_buffer): don't use g_utf8_next_char
since the UTF-8 isn't validated yet
* gtk/gtktextsegment.c (char_segment_check_func): don't require
lines to end in '\n'
* gtk/gtktextview.c (gtk_text_view_move_cursor): update to use
forward_to_delimiters, and grapheme boundaries
(gtk_text_view_delete_from_cursor): properly handle non-newline
delimiters, and grapheme boundaries
* gtk/gtktextiter.c (gtk_text_iter_forward_to_newline): rename
to gtk_text_iter_forward_to_delimiters, and make it work properly
if empty lines end with a character other than '\n'
* gtk/gtktextiter.h, gtk/gtktextiter.c: Add movement by cursor
position
Diffstat (limited to 'gtk/testtext.c')
| -rw-r--r-- | gtk/testtext.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gtk/testtext.c b/gtk/testtext.c index 6daeebae2..4eaf62b75 100644 --- a/gtk/testtext.c +++ b/gtk/testtext.c @@ -651,16 +651,13 @@ fill_file_buffer (GtkTextBuffer *buffer, const char *filename) if (!*leftover) break; - next = g_utf8_next_char (next); - if (next > buf+count+remaining) { - next = NULL; - break; - } + next = g_utf8_find_next_char (next, buf + count + remaining); } + g_assert (g_utf8_validate (buf, leftover - buf, NULL)); gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf); - remaining = buf + remaining + count - leftover; + remaining = (buf + remaining + count) - leftover; g_memmove (buf, leftover, remaining); if (remaining > 6 || count < to_read) |