diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-23 18:23:56 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-23 18:23:56 +0000 |
| commit | 87bab7a883bda1766606578470367310c6a5adaf (patch) | |
| tree | 88b046dc0a959014dc6902ffc57fd9596cfd0e65 | |
| parent | 65577fee8e8e7e01cabab72552f64f668270e640 (diff) | |
| parent | fcda7d6f9b6ee966f5da860be5ec0c0096193a83 (diff) | |
| download | pango-87bab7a883bda1766606578470367310c6a5adaf.tar.gz | |
Merge branch 'font-face-fixes' into 'master'
Font face fixes
Closes #494 and #528
See merge request GNOME/pango!277
| -rw-r--r-- | pango/fonts.c | 5 | ||||
| -rw-r--r-- | tests/test-font.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index 1695366b..0b76d9dd 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -2457,9 +2457,8 @@ pango_font_face_is_synthesized (PangoFontFace *face) * @face: a #PangoFontFace. * * Gets a name representing the style of this face among the - * different faces in the #PangoFontFamily for the face. This - * name is unique among all faces in the family and is suitable - * for displaying to users. + * different faces in the #PangoFontFamily for the face. The + * name is suitable for displaying to users. * * Return value: the face name for the face. This string is * owned by the face object and must not be modified or freed. diff --git a/tests/test-font.c b/tests/test-font.c index d02c7932..58a5bf8c 100644 --- a/tests/test-font.c +++ b/tests/test-font.c @@ -220,7 +220,7 @@ test_enumerate (void) for (i = 0; i < n_faces; i++) { face = pango_font_family_get_face (families[0], pango_font_face_get_face_name (faces[i])); - g_assert_true (face == faces[i]); + g_assert_cmpstr (pango_font_face_get_face_name (face), ==, pango_font_face_get_face_name (faces[i])); } desc = pango_font_description_new (); |