summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2003-04-15 16:10:45 +0000
committerOwen Taylor <otaylor@src.gnome.org>2003-04-15 16:10:45 +0000
commit739458e5d31c1fbf42a57cb1cfd2be0ccc069d12 (patch)
tree4aa095e20f2fcbbc7eb2ccf57ee926e4f0793c1e /pango
parent32eb6b5eb3d26736e3d2005f0748a70fedaee3d4 (diff)
downloadpango-739458e5d31c1fbf42a57cb1cfd2be0ccc069d12.tar.gz
Fix some stupid type registration/ class size problems from last commit.
Tue Apr 15 00:07:21 2003 Owen Taylor <otaylor@redhat.com> * pango/pangoft2.[ch]: Fix some stupid type registration/ class size problems from last commit.
Diffstat (limited to 'pango')
-rw-r--r--pango/pangoft2-private.h2
-rw-r--r--pango/pangoft2.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h
index 9b506061..71746f02 100644
--- a/pango/pangoft2-private.h
+++ b/pango/pangoft2-private.h
@@ -59,7 +59,7 @@ typedef struct _PangoFT2GlyphInfo PangoFT2GlyphInfo;
struct _PangoFT2Font
{
- PangoFont font;
+ PangoFcFont font;
FcPattern *font_pattern;
FT_Face face;
diff --git a/pango/pangoft2.c b/pango/pangoft2.c
index 100a51d4..d742118b 100644
--- a/pango/pangoft2.c
+++ b/pango/pangoft2.c
@@ -51,7 +51,7 @@ typedef struct _PangoFT2MetricsInfo PangoFT2MetricsInfo;
struct _PangoFT2FontClass
{
- PangoFontClass parent_class;
+ PangoFcFontClass parent_class;
};
struct _PangoFT2MetricsInfo
@@ -314,8 +314,8 @@ pango_ft2_font_get_type (void)
(GInstanceInitFunc) pango_ft2_font_init,
};
- object_type = g_type_register_static (PANGO_TYPE_FONT,
- "PangoFcFont",
+ object_type = g_type_register_static (PANGO_TYPE_FC_FONT,
+ "PangoFT2Font",
&object_info, 0);
}