diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-04-15 16:10:45 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-04-15 16:10:45 +0000 |
| commit | 739458e5d31c1fbf42a57cb1cfd2be0ccc069d12 (patch) | |
| tree | 4aa095e20f2fcbbc7eb2ccf57ee926e4f0793c1e | |
| parent | 32eb6b5eb3d26736e3d2005f0748a70fedaee3d4 (diff) | |
| download | pango-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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pangoft2-private.h | 2 | ||||
| -rw-r--r-- | pango/pangoft2.c | 6 |
7 files changed, 29 insertions, 4 deletions
@@ -1,3 +1,8 @@ +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. + Mon Apr 14 06:02:34 2003 Owen Taylor <otaylor@redhat.com> * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 6c6215f9..6ef5bdf3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +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. + Mon Apr 14 06:02:34 2003 Owen Taylor <otaylor@redhat.com> * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 6c6215f9..6ef5bdf3 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +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. + Mon Apr 14 06:02:34 2003 Owen Taylor <otaylor@redhat.com> * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 6c6215f9..6ef5bdf3 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +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. + Mon Apr 14 06:02:34 2003 Owen Taylor <otaylor@redhat.com> * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 6c6215f9..6ef5bdf3 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +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. + Mon Apr 14 06:02:34 2003 Owen Taylor <otaylor@redhat.com> * modules/thai/{thai-fc.c,thai-shaper.c,thai-x.c}: 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); } |