From b91e7a051c745021e53ec30ab114a54dafc52fb1 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 8 Dec 2008 03:41:22 +0000 Subject: [PATCH] =?utf8?q?Bug=20499624=20=E2=80=93=20Spaces=20around=20com?= =?utf8?q?mas=20in=20PangoFontDescription=20family=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-12-07 Behdad Esfahbod Bug 499624 – Spaces around commas in PangoFontDescription family name should be trimmed * pango/pangofc-fontmap.c (pango_fc_make_pattern): Trim family strings before adding to pattern. svn path=/trunk/; revision=2752 --- ChangeLog | 8 ++++++++ pango/pangofc-fontmap.c | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a8340e..bc124be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-12-07 Behdad Esfahbod + Bug 499624 – Spaces around commas in PangoFontDescription family name + should be trimmed + + * pango/pangofc-fontmap.c (pango_fc_make_pattern): Trim family strings + before adding to pattern. + +2008-12-07 Behdad Esfahbod + Bug 563557 – set g_get_prgname() in fc pattern * docs/pango-sections.txt: diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 5c5dbe5..edda2a3 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -845,8 +845,11 @@ pango_fc_make_pattern (const PangoFontDescription *description, families = g_strsplit (pango_font_description_get_family (description), ",", -1); - for (i = 0; families[i]; i++) - FcPatternAddString (pattern, FC_FAMILY, families[i]); + for (i = 0; families[i]; i++) { + char *family = pango_trim_string (families[i]); + FcPatternAddString (pattern, FC_FAMILY, family); + g_free (family); + } g_strfreev (families); -- 2.7.4