summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-10-26 02:09:51 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-10-26 02:09:51 +0000
commit89b0b8215c86e15205b79a508fb8779efaac3664 (patch)
tree5bfdb0896be38a85ffa6814a16eab129c2d1c19f
parent481f02efdb53542ce6fb1f5821cb6a4cfc83abee (diff)
downloadpango-89b0b8215c86e15205b79a508fb8779efaac3664.tar.gz
Call FcFontSetDestroy() instead of FcFontSetSortDestroy(). These days they
2007-10-25 Behdad Esfahbod <behdad@gnome.org> * pango/pangofc-fontmap.c (pango_fc_font_map_get_patterns): Call FcFontSetDestroy() instead of FcFontSetSortDestroy(). These days they are the same, but previously the latter was not freeing the actual patterns. But we don't need the sort patterns, so this retroactively fixes a leak in older versions! svn path=/trunk/; revision=2479
-rw-r--r--ChangeLog9
-rw-r--r--pango/pangofc-fontmap.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 93a8bbbc..f95f6b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2007-10-25 Behdad Esfahbod <behdad@gnome.org>
+ * pango/pangofc-fontmap.c (pango_fc_font_map_get_patterns):
+ Call FcFontSetDestroy() instead of FcFontSetSortDestroy().
+ These days they are the same, but previously the latter was
+ not freeing the actual patterns. But we don't need the
+ sort patterns, so this retroactively fixes a leak in older
+ versions!
+
+2007-10-25 Behdad Esfahbod <behdad@gnome.org>
+
* pango/opentype/*: Even more cleanup and more type renames.
2007-10-25 Behdad Esfahbod <behdad@gnome.org>
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index e8471ec1..ea23056c 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -1112,7 +1112,7 @@ pango_fc_font_map_get_patterns (PangoFontMap *fontmap,
FcPatternDestroy (pattern);
- FcFontSetSortDestroy (font_patterns);
+ FcFontSetDestroy (font_patterns);
patterns->key = fontset_hash_key_copy (&key);
g_hash_table_insert (priv->fontset_hash,