Include parent_instance structures.

Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>

	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
	parent_instance structures.

	* pango/fonts.c (pango_font_family_get_type): Pass in right
	class structure.

10 files changed, 61 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a3c014d8..b88be66f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
+	parent_instance structures.
+
+	* pango/fonts.c (pango_font_family_get_type): Pass in right
+	class structure.
+
 Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index a3c014d8..b88be66f 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,11 @@
+Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
+	parent_instance structures.
+
+	* pango/fonts.c (pango_font_family_get_type): Pass in right
+	class structure.
+
 Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index a3c014d8..b88be66f 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,11 @@
+Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
+	parent_instance structures.
+
+	* pango/fonts.c (pango_font_family_get_type): Pass in right
+	class structure.
+
 Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index a3c014d8..b88be66f 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,11 @@
+Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
+	parent_instance structures.
+
+	* pango/fonts.c (pango_font_family_get_type): Pass in right
+	class structure.
+
 Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index a3c014d8..b88be66f 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,11 @@
+Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
+	parent_instance structures.
+
+	* pango/fonts.c (pango_font_family_get_type): Pass in right
+	class structure.
+
 Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index a3c014d8..b88be66f 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,11 @@
+Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
+	parent_instance structures.
+
+	* pango/fonts.c (pango_font_family_get_type): Pass in right
+	class structure.
+
 Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index a3c014d8..b88be66f 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,11 @@
+Tue Sep 18 17:29:20 2001  Owen Taylor  <otaylor@redhat.com>
+
+	* pango/pangoft2-fontmap.c pango/pangoft2-private.h: Include
+	parent_instance structures.
+
+	* pango/fonts.c (pango_font_family_get_type): Pass in right
+	class structure.
+
 Tue Sep 18 15:47:08 2001  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in (PANGO_MINOR_VERSION): Up to 0.19.
diff --git a/pango/fonts.c b/pango/fonts.c
index 5a2c0ea0..bc0c9847 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -1277,7 +1277,7 @@ pango_font_family_get_type (void)
         NULL,           /* class_init */
         NULL,           /* class_finalize */
         NULL,           /* class_data */
-        sizeof (PangoFont),
+        sizeof (PangoFontFamily),
         0,              /* n_preallocs */
 	NULL            /* init */
       };
diff --git a/pango/pangoft2-fontmap.c b/pango/pangoft2-fontmap.c
index 0cd61109..8b0cf67c 100644
--- a/pango/pangoft2-fontmap.c
+++ b/pango/pangoft2-fontmap.c
@@ -74,6 +74,8 @@ struct _PangoFT2FontMap
 
 struct _PangoFT2Family
 {
+  PangoFontFamily parent_instance;
+  
   char *family_name;
 
   /* List of PangoFT2FontEntry structs */
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h
index 027ced1e..cc12206e 100644
--- a/pango/pangoft2-private.h
+++ b/pango/pangoft2-private.h
@@ -101,6 +101,8 @@ struct _PangoFT2GlyphInfo
 
 struct _PangoFT2Face
 {
+  PangoFontFace parent_instance;
+  
   FT_Open_Args **open_args;
   FT_Long *face_indices;
   int n_fonts;