diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-04-29 03:53:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-04-29 03:53:25 +0000 |
| commit | 6162f9d51a2b41f16df1352a1385972634e1509a (patch) | |
| tree | 2598efdd70faa8be889034c69f9522429f294556 | |
| parent | 0bce92f67d4a91383bcb155f773d76ee34649974 (diff) | |
| download | gdk-pixbuf-6162f9d51a2b41f16df1352a1385972634e1509a.tar.gz | |
Use _static variants when copying and merging short-lived Pango layouts.
2006-04-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcellrenderertext.c (get_size): Use _static variants when
copying and merging short-lived Pango layouts. (#340033, Morten Welinder)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | gtk/gtkcellrenderertext.c | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2006-04-28 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkcellrenderertext.c (get_size): Use _static variants when + copying and merging short-lived Pango layouts. (#340033, Morten Welinder) + 2006-04-28 Behdad Esfahbod <behdad@gnome.org> * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c03069f32..21b30ef4e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2006-04-28 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtkcellrenderertext.c (get_size): Use _static variants when + copying and merging short-lived Pango layouts. (#340033, Morten Welinder) + 2006-04-28 Behdad Esfahbod <behdad@gnome.org> * gtk/gtkwidget.c (gtk_widget_create_pango_layout): Fix typo in diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c index 0029a2862..a821e1d84 100644 --- a/gtk/gtkcellrenderertext.c +++ b/gtk/gtkcellrenderertext.c @@ -1497,8 +1497,8 @@ get_size (GtkCellRenderer *cell, PangoFontDescription *font_desc; gint row_height; - font_desc = pango_font_description_copy (widget->style->font_desc); - pango_font_description_merge (font_desc, celltext->font, TRUE); + font_desc = pango_font_description_copy_static (widget->style->font_desc); + pango_font_description_merge_static (font_desc, celltext->font, TRUE); if (celltext->scale_set) pango_font_description_set_size (font_desc, |