diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pango-layout.c | 4 |
4 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun Nov 21 10:46:34 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): Fix UTF8 => UTF-8 + in warning and doc comment. (#153551, Morten Welinder) + Sat Nov 20 23:50:40 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (get_glyph_extents_missing): Fix double diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 651d3868..1421c515 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Sun Nov 21 10:46:34 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): Fix UTF8 => UTF-8 + in warning and doc comment. (#153551, Morten Welinder) + Sat Nov 20 23:50:40 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (get_glyph_extents_missing): Fix double diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 651d3868..1421c515 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Sun Nov 21 10:46:34 2004 Owen Taylor <otaylor@redhat.com> + + * pango/pango-layout.c (pango_layout_set_text): Fix UTF8 => UTF-8 + in warning and doc comment. (#153551, Morten Welinder) + Sat Nov 20 23:50:40 2004 Owen Taylor <otaylor@redhat.com> * pango/pangoxft-font.c (get_glyph_extents_missing): Fix double diff --git a/pango/pango-layout.c b/pango/pango-layout.c index a02d78f4..5f846a78 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -764,7 +764,7 @@ pango_layout_get_ellipsize (PangoLayout *layout) /** * pango_layout_set_text: * @layout: a #PangoLayout - * @text: a UTF8-string + * @text: a UTF-8 string * @length: the length of @text, in bytes. -1 indicates that * the string is nul-terminated and the length should be * calculated. @@ -787,7 +787,7 @@ pango_layout_set_text (PangoLayout *layout, if (length != 0) { if (!g_utf8_validate (text, length, &end)) - g_warning ("Invalid UTF8 string passed to pango_layout_set_text()"); + g_warning ("Invalid UTF-8 string passed to pango_layout_set_text()"); length = end - text; } |