diff options
| author | Tor Lillqvist <tml@iki.fi> | 2010-09-08 20:33:30 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2010-09-08 21:31:34 +0300 |
| commit | 87141cf4c8f6d8cb3bfa1745e0dafa582fd0431e (patch) | |
| tree | f1a61864aadbaa0f4dd503aabe1e5c638eaa471f /gtk/gtktextlayout.c | |
| parent | 801875b8050e7113249943000276f72ffec07e6e (diff) | |
| download | gtk+-87141cf4c8f6d8cb3bfa1745e0dafa582fd0431e.tar.gz | |
Get rid of the rest of variables exported from libgtk
Especially the gtk_*_type ones in gtktexttypes.h were mentioned in
gtk.symbols presumably by accident. That header isn't even installed,
so no way can they be supposed to be public.
gtk_text_attr_appearance_type is from the installed but "semi-private"
gtktextlayout.h, so drop that one too from gtk.symbols for now.
The use of gtk_text_unknown_char_utf8 is bit of a mess. Code in a few
files knew implicitly that it is three bytes. Define a symbolic name
for the length of it instead. Add an exported function
gtk_text_unknown_char_utf8_gtk_tests_only() that returns a pointer to
it just for the sake of gtk/tests/textbuffer.c. Prefix the variable
with an underscore.
I doubt the usefulness of the test_utf8() in textbuffer.c. If it could
be dropped, gtk_text_unknown_char_utf8_gtk_tests_only() could be
dropped, too.
Diffstat (limited to 'gtk/gtktextlayout.c')
| -rw-r--r-- | gtk/gtktextlayout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index fba9de5780..74b3dd3d6b 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -2310,7 +2310,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout, size_only, FALSE); add_pixbuf_attrs (layout, display, style, seg, attrs, layout_byte_offset); - memcpy (text + layout_byte_offset, gtk_text_unknown_char_utf8, + memcpy (text + layout_byte_offset, _gtk_text_unknown_char_utf8, seg->byte_count); layout_byte_offset += seg->byte_count; buffer_byte_offset += seg->byte_count; @@ -2325,7 +2325,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout, size_only, FALSE); add_child_attrs (layout, display, style, seg, attrs, layout_byte_offset); - memcpy (text + layout_byte_offset, gtk_text_unknown_char_utf8, + memcpy (text + layout_byte_offset, _gtk_text_unknown_char_utf8, seg->byte_count); layout_byte_offset += seg->byte_count; buffer_byte_offset += seg->byte_count; |