diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2009-07-20 16:31:33 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2009-07-20 16:33:00 -0400 |
| commit | 5a75ce1414f43a36a5e510cc5cfac085671bfdca (patch) | |
| tree | e688f29946cb232aea66222b19e091a8ce9b78a6 /pango/pangofc-fontmap.c | |
| parent | 853f3ddd12ea2fbf3bed551ebfd542536e7f42e0 (diff) | |
| download | pango-5a75ce1414f43a36a5e510cc5cfac085671bfdca.tar.gz | |
Bug 585806 – crash during pango_fc_font_map_shutdown
Diffstat (limited to 'pango/pangofc-fontmap.c')
| -rw-r--r-- | pango/pangofc-fontmap.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 4f7c8dba..adbafaa4 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1974,7 +1974,6 @@ pango_fc_font_map_create_context (PangoFcFontMap *fcfontmap) return pango_font_map_create_context (PANGO_FONT_MAP (fcfontmap)); } -/* Closely related to _pango_fc_font_map_remove() */ static void shutdown_font (gpointer key, PangoFcFont *fcfont, @@ -1982,10 +1981,6 @@ shutdown_font (gpointer key, { _pango_fc_font_shutdown (fcfont); - /* While _pango_fc_font_shutdown() tries to call - * _pango_fc_font_map_remove(), it's too late as the fontmap - * weakref has already NULL'ed fcfont->fontmap, so we cleanup - * ourselves. */ _pango_fc_font_set_font_key (fcfont, NULL); pango_fc_font_key_free (key); } |