diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2009-02-02 00:13:22 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2009-02-02 00:13:22 +0000 |
| commit | 60de1bd238d6bedc80b2fa1dcabebacd3a7440ed (patch) | |
| tree | 32dde8e8509aa20afef49f68358736db94b7e505 | |
| parent | ac71657dc57952d37f86a59fd244f72a1bd32b14 (diff) | |
| download | pango-60de1bd238d6bedc80b2fa1dcabebacd3a7440ed.tar.gz | |
Don't do anything in shutdown. Was causing double-free of cairo font
2009-02-01 Behdad Esfahbod <behdad@gnome.org>
* pango/pangocairo-fcfont.c (pango_cairo_fc_font_class_init):
Don't do anything in shutdown. Was causing double-free of cairo
font private data.
svn path=/trunk/; revision=2825
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | pango/pangocairo-fcfont.c | 9 |
2 files changed, 6 insertions, 9 deletions
@@ -1,3 +1,9 @@ +2009-02-01 Behdad Esfahbod <behdad@gnome.org> + + * pango/pangocairo-fcfont.c (pango_cairo_fc_font_class_init): + Don't do anything in shutdown. Was causing double-free of cairo + font private data. + 2009-01-31 Behdad Esfahbod <behdad@gnome.org> * pango/opentype/harfbuzz-gpos.c (Load_Mark2Array), diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c index b583174a..3039f9ff 100644 --- a/pango/pangocairo-fcfont.c +++ b/pango/pangocairo-fcfont.c @@ -135,14 +135,6 @@ pango_cairo_fc_font_unlock_face (PangoFcFont *font) } static void -pango_cairo_fc_font_shutdown (PangoFcFont *fcfont) -{ - PangoCairoFcFont *cffont = (PangoCairoFcFont *) (fcfont); - - _pango_cairo_font_private_finalize (&cffont->cf_priv); -} - -static void pango_cairo_fc_font_class_init (PangoCairoFcFontClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); @@ -156,7 +148,6 @@ pango_cairo_fc_font_class_init (PangoCairoFcFontClass *class) fc_font_class->lock_face = pango_cairo_fc_font_lock_face; fc_font_class->unlock_face = pango_cairo_fc_font_unlock_face; - fc_font_class->shutdown = pango_cairo_fc_font_shutdown; } static void |