diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-11-27 15:17:15 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-11-27 15:17:15 +0000 |
| commit | 80b197df0c7d66929e40989ff23021126d6c9881 (patch) | |
| tree | 5fc0b846de72005be91db902f1438fdab1655665 /pango/fonts.c | |
| parent | ac2bf585e04c49be419f44a97c4ef0de0fd21014 (diff) | |
| parent | b2aabec7ca3d46d7833fef694915e4ddb5a179fe (diff) | |
| download | pango-80b197df0c7d66929e40989ff23021126d6c9881.tar.gz | |
Merge branch 'font-serialize-test' into 'main'
Avoid cosmetic ugliness
See merge request GNOME/pango!522
Diffstat (limited to 'pango/fonts.c')
| -rw-r--r-- | pango/fonts.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pango/fonts.c b/pango/fonts.c index d94feaf8..129e84d3 100644 --- a/pango/fonts.c +++ b/pango/fonts.c @@ -546,7 +546,7 @@ pango_font_description_set_variations_static (PangoFontDescription *desc, /** * pango_font_description_set_variations: * @desc: a `PangoFontDescription`. - * @variations: a string representing the variations + * @variations: (nullable): a string representing the variations * * Sets the variations field of a font description. * @@ -1492,7 +1492,8 @@ pango_font_description_to_string (const PangoFontDescription *desc) g_string_append (result, "px"); } - if (desc->variations && desc->mask & PANGO_FONT_MASK_VARIATIONS) + if ((desc->variations && desc->mask & PANGO_FONT_MASK_VARIATIONS) && + desc->variations[0] != '\0') { g_string_append (result, " @"); g_string_append (result, desc->variations); |