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

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;
     }