diff options
| author | Alex Larsson <alexl@redhat.com> | 2001-11-20 17:46:33 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2001-11-20 17:46:33 +0000 |
| commit | a57a0fe0c63407e07b2bc75066a675803869974b (patch) | |
| tree | dde6aa6af6393d17ed0fd3458d96a6c56be88cf4 | |
| parent | 3e32c400249ab1b220a793e832f45534502b4ac0 (diff) | |
| download | pango-a57a0fe0c63407e07b2bc75066a675803869974b.tar.gz | |
Don't free font_pattern if we opened the XftFont, since the XftFont claims
2001-11-20 Alex Larsson <alexl@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_finalize):
Don't free font_pattern if we opened the XftFont, since the
XftFont claims ownership of it.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 6 | ||||
| -rw-r--r-- | pango/pangoxft-font.c | 3 |
8 files changed, 44 insertions, 1 deletions
@@ -1,3 +1,9 @@ +2001-11-20 Alex Larsson <alexl@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_finalize): + Don't free font_pattern if we opened the XftFont, since the + XftFont claims ownership of it. + 2001-11-20 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_font_map_load_font): Fix diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index d187cb57..745bd299 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,9 @@ +2001-11-20 Alex Larsson <alexl@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_finalize): + Don't free font_pattern if we opened the XftFont, since the + XftFont claims ownership of it. + 2001-11-20 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_font_map_load_font): Fix diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d187cb57..745bd299 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,9 @@ +2001-11-20 Alex Larsson <alexl@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_finalize): + Don't free font_pattern if we opened the XftFont, since the + XftFont claims ownership of it. + 2001-11-20 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_font_map_load_font): Fix diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index d187cb57..745bd299 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,9 @@ +2001-11-20 Alex Larsson <alexl@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_finalize): + Don't free font_pattern if we opened the XftFont, since the + XftFont claims ownership of it. + 2001-11-20 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_font_map_load_font): Fix diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d187cb57..745bd299 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,9 @@ +2001-11-20 Alex Larsson <alexl@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_finalize): + Don't free font_pattern if we opened the XftFont, since the + XftFont claims ownership of it. + 2001-11-20 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_font_map_load_font): Fix diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d187cb57..745bd299 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,9 @@ +2001-11-20 Alex Larsson <alexl@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_finalize): + Don't free font_pattern if we opened the XftFont, since the + XftFont claims ownership of it. + 2001-11-20 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_font_map_load_font): Fix diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d187cb57..745bd299 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,9 @@ +2001-11-20 Alex Larsson <alexl@redhat.com> + + * pango/pangoxft-font.c (pango_xft_font_finalize): + Don't free font_pattern if we opened the XftFont, since the + XftFont claims ownership of it. + 2001-11-20 Tor Lillqvist <tml@iki.fi> * pango/pangowin32-fontmap.c (pango_win32_font_map_load_font): Fix diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c index 43f229a5..0b09ba20 100644 --- a/pango/pangoxft-font.c +++ b/pango/pangoxft-font.c @@ -428,10 +428,11 @@ pango_xft_font_finalize (GObject *object) g_object_unref (xfont->ot_info); pango_font_description_free (xfont->description); - XftPatternDestroy (xfont->font_pattern); if (xfont->xft_font) XftFontClose (display, xfont->xft_font); + else + XftPatternDestroy (xfont->font_pattern); /* If we opened the font it will own and destroy this pattern */ G_OBJECT_CLASS (parent_class)->finalize (object); } |