diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2011-04-15 18:45:24 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2011-04-15 18:45:24 -0400 |
| commit | 9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c (patch) | |
| tree | d2a207b07ae2cedae0ba2f4d007fa7be405b2fb7 /pango/pango-item.c | |
| parent | dff1f2b0d6c353f0839a7a38115c69cd915f9cbd (diff) | |
| parent | 08fd5cf33d875c161dd5280b92d1633469943620 (diff) | |
| download | pango-9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c.tar.gz | |
Merge branch 'master' into harfbuzz-ng-external
Conflicts:
pango/opentype/hb-buffer-private.h
pango/opentype/hb-buffer.c
pango/opentype/hb-buffer.h
pango/opentype/hb-open-type-private.hh
pango/opentype/hb-ot-layout-gpos-private.hh
Diffstat (limited to 'pango/pango-item.c')
| -rw-r--r-- | pango/pango-item.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pango/pango-item.c b/pango/pango-item.c index 9d8edd03..0437d9ce 100644 --- a/pango/pango-item.c +++ b/pango/pango-item.c @@ -106,17 +106,9 @@ pango_item_free (PangoItem *item) g_slice_free (PangoItem, item); } -GType -pango_item_get_type (void) -{ - static GType our_type = 0; - - if (G_UNLIKELY (our_type == 0)) - our_type = g_boxed_type_register_static (I_("PangoItem"), - (GBoxedCopyFunc) pango_item_copy, - (GBoxedFreeFunc) pango_item_free); - return our_type; -} +G_DEFINE_BOXED_TYPE (PangoItem, pango_item, + pango_item_copy, + pango_item_free); /** * pango_item_split: |