summaryrefslogtreecommitdiff
path: root/pango/pangoft2.c
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2005-11-09 07:43:09 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2005-11-09 07:43:09 +0000
commita671bf6772c2341ecb3bef9f6b0671603d2f9619 (patch)
tree44b0661219d21e3bd3e66a933cb06978a3ae0ec3 /pango/pangoft2.c
parentba2a78f0035834cd4031daa3d9097378affea072 (diff)
downloadpango-a671bf6772c2341ecb3bef9f6b0671603d2f9619.tar.gz
Set layout wrapping to PANGO_WRAP_WORD_CHAR if width is set for the
2005-11-09 Behdad Esfahbod <behdad@gnome.org> * examples/renderdemo.c (make_layout): Set layout wrapping to PANGO_WRAP_WORD_CHAR if width is set for the layout. Setting width didn't have any effect previously. * pango/pango-layout.c (process_item): Remove the excess letter_spacing adjustment on the item width. (#168593, Damon Chaplin) * pango/pango-markup.c (pango_parse_markup), pango/querymodules.c: Replace g_string_new ("") with g_string_new (NULL). * pango/pangoft2.c: Use g_malloc'ed memory for unknown FreeType2 error, instead of static buffer.
Diffstat (limited to 'pango/pangoft2.c')
-rw-r--r--pango/pangoft2.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 4533907f..a77a5a32 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -468,7 +468,10 @@ _pango_ft2_ft_strerror (FT_Error error)
return found->msg;
else
{
- static char default_msg[100];
+ static char *default_msg = NULL;
+
+ if (!default_msg)
+ default_msg = g_malloc (60);
g_sprintf (default_msg, "Unknown FreeType2 error %#x", error);
return default_msg;