From a8bbb8fa9a2cc1b9a2ce1467c053c2d1ff2534da Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 27 May 2008 09:17:24 +0000 Subject: [PATCH] After the change to how the standard pseudo font families are set up 2008-05-27 Tor Lillqvist * pango/pangowin32-fontmap.c (pango_win32_family_list_faces): After the change to how the standard pseudo font families are set up below, we don't need to prune out duplicate face names any longer. svn path=/trunk/; revision=2641 --- ChangeLog | 7 +++++++ pango/pangowin32-fontmap.c | 22 ++-------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b7050e..1559ab5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-05-27 Tor Lillqvist + * pango/pangowin32-fontmap.c (pango_win32_family_list_faces): + After the change to how the standard pseudo font families are set + up below, we don't need to prune out duplicate face names any + longer. + +2008-05-27 Tor Lillqvist + Bug 436363 - Bold and Bold Italic style of MS-Mincho font are not listed in GtkFontSelection diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 21c7583..3686103 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -479,17 +479,7 @@ pango_win32_family_list_faces (PangoFontFamily *family, n = 0; while (p) { - GSList *q; - q = win32family->faces; - while (q != p) - { - if (strcmp (pango_win32_face_get_face_name ((PangoFontFace *) q->data), - pango_win32_face_get_face_name ((PangoFontFace *) p->data)) == 0) - break; - q = q->next; - } - if (q == p) - n++; + n++; p = p->next; } @@ -503,15 +493,7 @@ pango_win32_family_list_faces (PangoFontFamily *family, i = 0; while (p) { - int j; - for (j = 0; j < i; j++) - { - if (strcmp (pango_win32_face_get_face_name ((*faces)[j]), - pango_win32_face_get_face_name ((PangoFontFace *) p->data)) == 0) - break; - } - if (j == i) - (*faces)[i++] = p->data; + (*faces)[i++] = p->data; p = p->next; } } -- 2.7.4