diff options
author | Behdad Esfahbod <behdad@behdad.org> | 2011-06-17 15:42:16 -0400 |
---|---|---|
committer | Behdad Esfahbod <behdad@behdad.org> | 2011-06-17 15:42:16 -0400 |
commit | 0b469b7eeb36ce8181b404f24eaaacaa9ec2c3fe (patch) | |
tree | b89838087398df711b6b88337d67eac7eb02e7b8 /pango/pango-ot-info.c | |
parent | 7f9f7184286d584398603e449271d8bbd0e2e101 (diff) | |
parent | 26092c20b0936ff669513fbd64537123b99d036e (diff) | |
download | pango-0b469b7eeb36ce8181b404f24eaaacaa9ec2c3fe.tar.gz |
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
configure.in
pango/opentype/hb-common.h
pango/pango-ot-info.c
Diffstat (limited to 'pango/pango-ot-info.c')
-rw-r--r-- | pango/pango-ot-info.c | 37 |
1 files changed, 6 insertions, 31 deletions
diff --git a/pango/pango-ot-info.c b/pango/pango-ot-info.c index b03fa64b..56d28bfe 100644 --- a/pango/pango-ot-info.c +++ b/pango/pango-ot-info.c @@ -25,44 +25,19 @@ #include "pango-impl-utils.h" #include FT_TRUETYPE_TABLES_H -static void pango_ot_info_class_init (GObjectClass *object_class); static void pango_ot_info_finalize (GObject *object); -static GObjectClass *parent_class; +G_DEFINE_TYPE (PangoOTInfo, pango_ot_info, G_TYPE_OBJECT); -GType -pango_ot_info_get_type (void) +static void +pango_ot_info_init (PangoOTInfo *self) { - static GType object_type = 0; - - if (G_UNLIKELY (!object_type)) - { - const GTypeInfo object_info = - { - sizeof (PangoOTInfoClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc)pango_ot_info_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (PangoOTInfo), - 0, /* n_preallocs */ - NULL, /* init */ - NULL, /* value_table */ - }; - - object_type = g_type_register_static (G_TYPE_OBJECT, - I_("PangoOTInfo"), - &object_info, 0); - } - - return object_type; } static void -pango_ot_info_class_init (GObjectClass *object_class) +pango_ot_info_class_init (PangoOTInfoClass *klass) { - parent_class = g_type_class_peek_parent (object_class); + GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = pango_ot_info_finalize; } @@ -75,7 +50,7 @@ pango_ot_info_finalize (GObject *object) if (info->hb_face) hb_face_destroy (info->hb_face); - parent_class->finalize (object); + G_OBJECT_CLASS (pango_ot_info_parent_class)->finalize (object); } static void |