From a9ff0d386ec26c51e1ab44f7d8a1da2a80ea2b7b Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 28 Oct 2008 17:09:21 +0000 Subject: [PATCH] =?utf8?q?Bug=20558254=20=E2=80=93=20Internal=20reference?= =?utf8?q?=20handling=20messed=20up?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-10-28 Behdad Esfahbod Bug 558254 – Internal reference handling messed up * pango/pangofc-font.c (pango_fc_font_get_coverage): * pango/pangofc-fontmap.c (pango_fc_font_map_finalize): Make sure fonts->fontmap is set to NULL when fontmap finalizes. svn path=/trunk/; revision=2734 --- ChangeLog | 8 ++++++++ pango/pangofc-font.c | 3 +++ pango/pangofc-fontmap.c | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 82e1c03..91283a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-28 Behdad Esfahbod + + Bug 558254 – Internal reference handling messed up + + * pango/pangofc-font.c (pango_fc_font_get_coverage): + * pango/pangofc-fontmap.c (pango_fc_font_map_finalize): + Make sure fonts->fontmap is set to NULL when fontmap finalizes. + 2008-10-27 Richard Hult Bug 558107 – is_monospace always returns FALSE in pangoatsui diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c index 9acd75d..b5d65ca 100644 --- a/pango/pangofc-font.c +++ b/pango/pangofc-font.c @@ -309,6 +309,9 @@ pango_fc_font_get_coverage (PangoFont *font, return _pango_fc_font_map_fc_to_coverage (charset); } + if (!fcfont->fontmap) + return pango_coverage_new (); + return _pango_fc_font_map_get_coverage (PANGO_FC_FONT_MAP (fcfont->fontmap), fcfont); } diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 0bc21b9..4bb5188 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -484,7 +484,10 @@ pango_fc_font_map_finalize (GObject *object) PangoFcFontMap *fcfontmap = PANGO_FC_FONT_MAP (object); PangoFcFontMapPrivate *priv = fcfontmap->priv; - pango_fc_font_map_cache_clear (fcfontmap); + + /* Shutdown, so we clear the fonts and mark them as shut down */ + pango_fc_font_map_shutdown (fcfontmap); + g_queue_free (priv->fontset_cache); g_hash_table_destroy (priv->coverage_hash); -- 2.7.4