diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-06-14 19:54:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-06-14 19:54:46 +0000 |
| commit | 56a21f804d432cfbba37bd17c6d3451b865890e1 (patch) | |
| tree | 13d25f82438af829da1d8c2fcb6a59bc978d3663 | |
| parent | ed399c9dd5c824cf9540fd93672fe11a3fe008dc (diff) | |
| download | pango-56a21f804d432cfbba37bd17c6d3451b865890e1.tar.gz | |
Chain up from finalize. (#307547, Paolo Borelli)
2005-06-14 Owen Taylor <otaylor@redhat.com>
* pango/opentype/pango-ot-info.c (pango_ot_info_finalize)
pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize):
Chain up from finalize. (#307547, Paolo Borelli)
* pango/opentype/pango-ot-info.c (pango_ot_info_finalizer):
make accidentally public function static.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | pango/opentype/pango-ot-info.c | 4 | ||||
| -rw-r--r-- | pango/opentype/pango-ot-ruleset.c | 2 |
4 files changed, 23 insertions, 1 deletions
@@ -1,5 +1,14 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/opentype/pango-ot-info.c (pango_ot_info_finalize) + pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize): + Chain up from finalize. (#307547, Paolo Borelli) + + * pango/opentype/pango-ot-info.c (pango_ot_info_finalizer): + make accidentally public function static. + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/ellipsize.c (shape_ellipsis): Fix FALSE/TRUE typo that was causing crashes with fonts not containing ".". (#304039, Sebastien Bacher) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 3d851744..fbb9e498 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,14 @@ 2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/opentype/pango-ot-info.c (pango_ot_info_finalize) + pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize): + Chain up from finalize. (#307547, Paolo Borelli) + + * pango/opentype/pango-ot-info.c (pango_ot_info_finalizer): + make accidentally public function static. + +2005-06-14 Owen Taylor <otaylor@redhat.com> + * pango/ellipsize.c (shape_ellipsis): Fix FALSE/TRUE typo that was causing crashes with fonts not containing ".". (#304039, Sebastien Bacher) diff --git a/pango/opentype/pango-ot-info.c b/pango/opentype/pango-ot-info.c index a6baa7fd..9a0f3f09 100644 --- a/pango/opentype/pango-ot-info.c +++ b/pango/opentype/pango-ot-info.c @@ -92,9 +92,11 @@ pango_ot_info_finalize (GObject *object) TT_Done_GPOS_Table (info->gpos); info->gpos = NULL; } + + parent_class->finalize (object); } -void +static void pango_ot_info_finalizer (void *object) { FT_Face face = object; diff --git a/pango/opentype/pango-ot-ruleset.c b/pango/opentype/pango-ot-ruleset.c index 47af334b..4c219301 100644 --- a/pango/opentype/pango-ot-ruleset.c +++ b/pango/opentype/pango-ot-ruleset.c @@ -88,6 +88,8 @@ pango_ot_ruleset_finalize (GObject *object) g_array_free (ruleset->rules, TRUE); g_object_unref (ruleset->info); + + parent_class->finalize (object); } /** |