[pango] Bug 586814 – Crashes related to fontmap destruction after upgrade

[Behdad Esfahbod <behdad src gnome org>]

commit 643b70644aabdbebd6bdfe7a5f128efde39caced
Author: Behdad Esfahbod <behdad behdad org>
Date:   Wed Jun 24 23:03:39 2009 -0400

    Bug 586814 â?? Crashes related to fontmap destruction after upgrade
    
    Followup patch from Morten.

 pango/pangofc-font.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/pango/pangofc-font.c b/pango/pangofc-font.c
index e5df33d..509d098 100644
--- a/pango/pangofc-font.c
+++ b/pango/pangofc-font.c
@@ -140,7 +140,11 @@ pango_fc_font_finalize (GObject *object)
   g_slist_free (fcfont->metrics_by_lang);
 
   if (fcfont->fontmap)
-    _pango_fc_font_map_remove (PANGO_FC_FONT_MAP (fcfont->fontmap), fcfont);
+    {
+      _pango_fc_font_map_remove (PANGO_FC_FONT_MAP (fcfont->fontmap), fcfont);
+      g_object_remove_weak_pointer (G_OBJECT (fcfont->fontmap), (gpointer *) (gpointer) &fcfont->fontmap);
+      fcfont->fontmap = NULL;
+    }
 
   FcPatternDestroy (fcfont->font_pattern);
   pango_font_description_free (fcfont->description);