diff options
| -rw-r--r-- | pango/pangofc-font.c | 2 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 46ce282c..e5df33d2 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -109,7 +109,7 @@ pango_fc_font_class_init (PangoFcFontClass *class) "Font Map", "The PangoFc font map this font is associated with (Since: 1.26)", PANGO_TYPE_FC_FONT_MAP, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_type_class_add_private (object_class, sizeof (PangoFcFontPrivate)); diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 6ef90019..4db62159 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1565,6 +1565,11 @@ pango_fc_font_map_new_font (PangoFcFontMap *fcfontmap, return NULL; fcfont->matrix = key.matrix; + /* In case the backend didn't set the fontmap */ + if (!fcfont->fontmap) + g_object_set (fcfont, + "fontmap", fcfontmap, + NULL); /* cache it on fontmap */ pango_fc_font_map_add (fcfontmap, &key, fcfont); |