summaryrefslogtreecommitdiff
path: root/pango/pangoft2-fontmap.c
diff options
context:
space:
mode:
authorAlexander Larsson <alla@lysator.liu.se>2001-12-12 07:13:44 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-12-12 07:13:44 +0000
commit8c5fa6fdc92849ada0833e6e71701f59b89fad9c (patch)
tree654f266d0ad99276ffbd87509176d1340d6bafbc /pango/pangoft2-fontmap.c
parentbcf6c7a607dbce17ed36e8596b0a9465a7711e0a (diff)
downloadpango-8c5fa6fdc92849ada0833e6e71701f59b89fad9c.tar.gz
Initialize MiniXft library before calling MiniXftConfigSubstitute.
2001-12-12 Alexander Larsson <alla@lysator.liu.se> * pango/pangoft2-fontmap.c (pango_ft2_font_map_load_fontset): Initialize MiniXft library before calling MiniXftConfigSubstitute. * pango/mini-xft/minixftdir.c (MiniXftDirScan): Changed back filename from MiniXftCache to XftCache for compat with Xft.
Diffstat (limited to 'pango/pangoft2-fontmap.c')
-rw-r--r--pango/pangoft2-fontmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index efe53442..15efae0b 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -545,6 +545,9 @@ pango_ft2_font_map_load_fontset (PangoFontMap *fontmap,
{
pattern = pango_ft2_make_pattern (desc);
+ MiniXftInit (0);
+ MiniXftInitFtLibrary ();
+
MiniXftConfigSubstitute (pattern);
MiniXftDefaultSubstitute ((Display *)1, 0, pattern);
@@ -553,9 +556,6 @@ pango_ft2_font_map_load_fontset (PangoFontMap *fontmap,
array = g_ptr_array_new ();
patterns = g_new (PangoFT2PatternSet, 1);
- MiniXftInit (0);
- MiniXftInitFtLibrary ();
-
match = NULL;
id = 0;
while (MiniXftPatternGetString (pattern, XFT_FAMILY, id++, &family) == MiniXftResultMatch)