Re: PangoXft patch

[Owen Taylor <otaylor redhat com>]

Alex Larsson <alexl redhat com> writes:

> PangoXft currently crashes if you load ten different fonts.
> 
> Is this ok to check in?

Yes, go ahead. (For bugs in your code, you don't really need
to ask for commit permission to fix them ;-)

Regards,
                                        Owen

> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/pango/ChangeLog,v
> retrieving revision 1.370
> diff -u -p -r1.370 ChangeLog
> --- ChangeLog	2001/11/19 22:45:52	1.370
> +++ ChangeLog	2001/11/20 17:33:48
> @@ -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
> Index: pango/pangoxft-font.c
> ===================================================================
> RCS file: /cvs/gnome/pango/pango/pangoxft-font.c,v
> retrieving revision 1.17
> diff -u -p -r1.17 pangoxft-font.c
> --- pango/pangoxft-font.c	2001/11/18 23:23:14	1.17
> +++ pango/pangoxft-font.c	2001/11/20 17:33:48
> @@ -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);
>  }