diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-05-09 01:31:58 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-09 01:31:58 +0000 |
commit | 4dcd060cc51c0ff954db365f06ac117d90c0443b (patch) | |
tree | 287afc250eabf5c188b3f8c4e8b42347acb9e159 /pango/pangocairo-fcfontmap.c | |
parent | 73b46b04c724335ad73534cc69955baa2388b861 (diff) | |
parent | 5f2a5bbc95363ba25a6a7c107cd7daf260167e8b (diff) | |
download | pango-4dcd060cc51c0ff954db365f06ac117d90c0443b.tar.gz |
Merge branch 'pango-1-44' into 'pango-1-44'pango-1-44
[1.44] Cherry pick various upstream fixes
See merge request GNOME/pango!321
Diffstat (limited to 'pango/pangocairo-fcfontmap.c')
-rw-r--r-- | pango/pangocairo-fcfontmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pango/pangocairo-fcfontmap.c b/pango/pangocairo-fcfontmap.c index bd3a8583..015b8170 100644 --- a/pango/pangocairo-fcfontmap.c +++ b/pango/pangocairo-fcfontmap.c @@ -103,7 +103,7 @@ pango_cairo_fc_font_map_fontset_key_substitute (PangoFcFontMap *fcfontmap G_G PangoFcFontsetKey *fontkey, FcPattern *pattern) { - FcConfigSubstitute (NULL, pattern, FcMatchPattern); + FcConfigSubstitute (pango_fc_font_map_get_config (fcfontmap), pattern, FcMatchPattern); if (fontkey) cairo_ft_font_options_substitute (pango_fc_fontset_key_get_context_key (fontkey), |