Fix problem where pango_xft_get_unknown_glyph() was being used for X

Sat Jul 27 09:46:51 2002  Owen Taylor  <otaylor@redhat.com>

        * modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
        (make_unknown_glyph): Fix problem where
        pango_xft_get_unknown_glyph() was being used for X
        fonts. (reported by Jacob Berkman)

11 files changed, 67 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 1a289c49..253ad36b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Jul 27 09:46:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
+	(make_unknown_glyph): Fix problem where 
+	pango_xft_get_unknown_glyph() was being used for X
+	fonts. (reported by Jacob Berkman)
+
 Fri Jul 26 19:46:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/basic/basic-x.c modules/basic/tables-big.i:
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 1a289c49..253ad36b 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Sat Jul 27 09:46:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
+	(make_unknown_glyph): Fix problem where 
+	pango_xft_get_unknown_glyph() was being used for X
+	fonts. (reported by Jacob Berkman)
+
 Fri Jul 26 19:46:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/basic/basic-x.c modules/basic/tables-big.i:
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 1a289c49..253ad36b 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Sat Jul 27 09:46:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
+	(make_unknown_glyph): Fix problem where 
+	pango_xft_get_unknown_glyph() was being used for X
+	fonts. (reported by Jacob Berkman)
+
 Fri Jul 26 19:46:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/basic/basic-x.c modules/basic/tables-big.i:
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 1a289c49..253ad36b 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Sat Jul 27 09:46:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
+	(make_unknown_glyph): Fix problem where 
+	pango_xft_get_unknown_glyph() was being used for X
+	fonts. (reported by Jacob Berkman)
+
 Fri Jul 26 19:46:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/basic/basic-x.c modules/basic/tables-big.i:
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 1a289c49..253ad36b 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Sat Jul 27 09:46:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
+	(make_unknown_glyph): Fix problem where 
+	pango_xft_get_unknown_glyph() was being used for X
+	fonts. (reported by Jacob Berkman)
+
 Fri Jul 26 19:46:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/basic/basic-x.c modules/basic/tables-big.i:
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 1a289c49..253ad36b 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Sat Jul 27 09:46:51 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* modules/thai/{thai-shaper.[ch],thai-x.c,thai-xft.c}
+	(make_unknown_glyph): Fix problem where 
+	pango_xft_get_unknown_glyph() was being used for X
+	fonts. (reported by Jacob Berkman)
+
 Fri Jul 26 19:46:45 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* modules/basic/basic-x.c modules/basic/tables-big.i:
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index b2a4d447..657a61c0 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 #include "pango-engine.h"
+#include "pangoxft.h"
 #include "thai-shaper.h"
 
 #define SCRIPT_ENGINE_NAME "ThaiScriptEngineXft"
@@ -188,6 +189,12 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c)
     return 0;
 }
 
+PangoGlyph
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c)
+{
+  return pango_xft_font_get_unknown_glyph (font_info->font, c);
+}
+
 static PangoCoverage *
 thai_engine_get_coverage (PangoFont  *font,
 			   PangoLanguage *lang)
diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c
index 1c1a9785..c5f8dfa4 100644
--- a/modules/thai/thai-shaper.c
+++ b/modules/thai/thai-shaper.c
@@ -30,7 +30,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include "pangoxft.h"
 #include "pango-engine.h"
 #include "thai-shaper.h"
 
@@ -570,7 +569,7 @@ get_glyphs_list (ThaiFontInfo	*font_info,
     {
       case THAI_FONT_NONE:
         for (i=0; i < num_chrs; i++)
-	  glyph_lists[i] = pango_xft_font_get_unknown_glyph (font_info->font, glyph_lists[i]);
+	  glyph_lists[i] = make_unknown_glyph (font_info, glyph_lists[i]);
         return num_chrs;
 
       case THAI_FONT_XTIS:
diff --git a/modules/thai/thai-shaper.h b/modules/thai/thai-shaper.h
index c27b1bed..f4e67917 100644
--- a/modules/thai/thai-shaper.h
+++ b/modules/thai/thai-shaper.h
@@ -2,7 +2,6 @@
 #define __THAI_SHAPER_H__
 
 #include "pangox.h"
-#include "pangoxft.h"
 
 #define ucs2tis(wc)     (unsigned int)((unsigned int)(wc) - 0x0E00 + 0xA0)
 #define tis2uni(c)      ((gunichar)(c) - 0xA0 + 0x0E00)
@@ -32,7 +31,7 @@ struct _ThaiFontInfo
   ThaiFontInfoType info_type;
   union {
     PangoXSubfont subfont; /* THAI_FONTINFO_X */
-    FT_Face       face;    /* THAI_FONTINFO_XFT */
+    gpointer      face;    /* THAI_FONTINFO_XFT */
   } info;
 };
 
@@ -45,6 +44,9 @@ get_font_info (PangoFont *font);
 PangoGlyph
 make_glyph (ThaiFontInfo *font_info, unsigned char c);
 
+PangoGlyph
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c);
+
 /*
  * Public functions
  */
diff --git a/modules/thai/thai-x.c b/modules/thai/thai-x.c
index dace340a..f2c96337 100644
--- a/modules/thai/thai-x.c
+++ b/modules/thai/thai-x.c
@@ -132,6 +132,12 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c)
   return PANGO_X_MAKE_GLYPH (font_info->info.subfont, c);
 }
 
+PangoGlyph
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c)
+{
+  return pango_x_get_unknown_glyph (font_info->font);
+}
+
 static PangoCoverage *
 thai_engine_get_coverage (PangoFont  *font,
 			   PangoLanguage *lang)
diff --git a/modules/thai/thai-xft.c b/modules/thai/thai-xft.c
index b2a4d447..657a61c0 100644
--- a/modules/thai/thai-xft.c
+++ b/modules/thai/thai-xft.c
@@ -31,6 +31,7 @@
 
 #include <glib.h>
 #include "pango-engine.h"
+#include "pangoxft.h"
 #include "thai-shaper.h"
 
 #define SCRIPT_ENGINE_NAME "ThaiScriptEngineXft"
@@ -188,6 +189,12 @@ make_glyph (ThaiFontInfo *font_info, unsigned char c)
     return 0;
 }
 
+PangoGlyph
+make_unknown_glyph (ThaiFontInfo *font_info, unsigned char c)
+{
+  return pango_xft_font_get_unknown_glyph (font_info->font, c);
+}
+
 static PangoCoverage *
 thai_engine_get_coverage (PangoFont  *font,
 			   PangoLanguage *lang)