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.

9 files changed, 68 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 26fe1c1d..8c53fc41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2001-12-11  Alex Larsson  <alexl@redhat.com>
 
 	* pango/pangoft2.c (pango_ft2_render):
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 26fe1c1d..8c53fc41 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,12 @@
+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.
+
 2001-12-11  Alex Larsson  <alexl@redhat.com>
 
 	* pango/pangoft2.c (pango_ft2_render):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 26fe1c1d..8c53fc41 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,12 @@
+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.
+
 2001-12-11  Alex Larsson  <alexl@redhat.com>
 
 	* pango/pangoft2.c (pango_ft2_render):
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 26fe1c1d..8c53fc41 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,12 @@
+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.
+
 2001-12-11  Alex Larsson  <alexl@redhat.com>
 
 	* pango/pangoft2.c (pango_ft2_render):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 26fe1c1d..8c53fc41 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,12 @@
+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.
+
 2001-12-11  Alex Larsson  <alexl@redhat.com>
 
 	* pango/pangoft2.c (pango_ft2_render):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 26fe1c1d..8c53fc41 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,12 @@
+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.
+
 2001-12-11  Alex Larsson  <alexl@redhat.com>
 
 	* pango/pangoft2.c (pango_ft2_render):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 26fe1c1d..8c53fc41 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,12 @@
+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.
+
 2001-12-11  Alex Larsson  <alexl@redhat.com>
 
 	* pango/pangoft2.c (pango_ft2_render):
diff --git a/pango/mini-xft/minixftdir.c b/pango/mini-xft/minixftdir.c
index c6eacb10..f791b630 100644
--- a/pango/mini-xft/minixftdir.c
+++ b/pango/mini-xft/minixftdir.c
@@ -50,7 +50,7 @@ MiniXftDirScan (MiniXftFontSet *set, const char *dir, Bool force)
     base = file + strlen (file);
     if (!force)
     {
-	strcpy (base, "MiniXftCache");
+	strcpy (base, "XftCache");
 	
 	if (MiniXftFileCacheReadDir (set, file))
 	{
@@ -128,7 +128,7 @@ MiniXftDirSave (MiniXftFontSet *set, const char *dir)
     strcpy (file, dir);
     strcat (file, "/");
     base = file + strlen (file);
-    strcpy (base, "MiniXftCache");
+    strcpy (base, "XftCache");
     ret = MiniXftFileCacheWriteDir (set, file);
     free (file);
     return ret;
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)