diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2008-12-08 03:53:12 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-12-08 03:53:12 +0000 |
commit | 52fc190261c536c86e5e4e7d50bf990d02eba18e (patch) | |
tree | ed2b073147ddb2208629af050620fa5fd8a3602e /pango/fonts.c | |
parent | b91e7a051c745021e53ec30ab114a54dafc52fb1 (diff) | |
download | pango-52fc190261c536c86e5e4e7d50bf990d02eba18e.tar.gz |
Bug 499624 – Spaces around commas in PangoFontDescription family name
2008-12-07 Behdad Esfahbod <behdad@gnome.org>
Bug 499624 – Spaces around commas in PangoFontDescription family name
should be trimmed
* pango/fonts.c (pango_font_description_from_string):
* pango/pangofc-fontmap.c (pango_fc_make_pattern):
Do it in pango_font_description_from_string() instead of pangofc
backend.
svn path=/trunk/; revision=2753
Diffstat (limited to 'pango/fonts.c')
-rw-r--r-- | pango/fonts.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index af71a5e6..f5570b20 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -1084,7 +1084,23 @@ pango_font_description_from_string (const char *str) if (str != last) { + int i; + char **families; + desc->family_name = g_strndup (str, last - str); + + /* Now sanitize it to trim space from around individual family names. + * bug #499624 */ + + families = g_strsplit (desc->family_name, ",", -1); + + for (i = 0; families[i]; i++) + g_strstrip (families[i]); + + g_free (desc->family_name); + desc->family_name = g_strjoinv (",", families); + g_strfreev (families); + desc->mask |= PANGO_FONT_MASK_FAMILY; } |