From 25d649abbf81ac35cbcbe93864391c0e080d79d7 Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Thu, 29 Jan 2004 18:10:29 +0000 Subject: [PATCH] Free font_desc. Fixes #132805. 2004-01-28 Richard Hult * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): Free font_desc. Fixes #132805. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcellrenderertext.c | 4 +++- 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9b4b62cc43..8b8d583eb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ +2004-01-28 Richard Hult + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): + Free font_desc. Fixes #132805. + 2004-01-29 Federico Mena Quintero * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError. Patch provided by Christian Persch + Fixes #132574. Thu Jan 29 11:00:18 2004 Owen Taylor diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9b4b62cc43..8b8d583eb7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,13 @@ +2004-01-28 Richard Hult + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): + Free font_desc. Fixes #132805. + 2004-01-29 Federico Mena Quintero * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError. Patch provided by Christian Persch + Fixes #132574. Thu Jan 29 11:00:18 2004 Owen Taylor diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9b4b62cc43..8b8d583eb7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,7 +1,13 @@ +2004-01-28 Richard Hult + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): + Free font_desc. Fixes #132805. + 2004-01-29 Federico Mena Quintero * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError. Patch provided by Christian Persch + Fixes #132574. Thu Jan 29 11:00:18 2004 Owen Taylor diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9b4b62cc43..8b8d583eb7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,7 +1,13 @@ +2004-01-28 Richard Hult + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): + Free font_desc. Fixes #132805. + 2004-01-29 Federico Mena Quintero * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError. Patch provided by Christian Persch + Fixes #132574. Thu Jan 29 11:00:18 2004 Owen Taylor diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9b4b62cc43..8b8d583eb7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,7 +1,13 @@ +2004-01-28 Richard Hult + + * gtk/gtkcellrenderertext.c (gtk_cell_renderer_text_get_size): + Free font_desc. Fixes #132805. + 2004-01-29 Federico Mena Quintero * gtk/gtkiconfactory.c (render_icon_name_pixbuf): Free the GError. Patch provided by Christian Persch + Fixes #132574. Thu Jan 29 11:00:18 2004 Owen Taylor diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 8adae8a28f..f1f7896791 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1308,7 +1308,9 @@ gtk_cell_renderer_text_get_size (GtkCellRenderer *cell, row_height = (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics)); pango_font_metrics_unref (metrics); - + + pango_font_description_free (font_desc); + gtk_cell_renderer_set_fixed_size (cell, cell->width, 2*cell->ypad + celltext->fixed_height_rows * PANGO_PIXELS (row_height));