callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 742775: Crash when editing text with certain fonts

Browse Source
This commit is contained in:
Massimo Valentini
2015-02-03 18:33:12 +01:00
parent 3756df29af
commit 09c5fcc32b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/widgets/gimptextbuffer.c
View File

@ -827,6 +827,10 @@ gimp_text_buffer_get_font_tag (GimpTextBuffer *buffer,
GList *list;
GtkTextTag *tag;
gchar name[256];
PangoFontDescription *pfd = pango_font_description_from_string (font);
char *description = pango_font_description_to_string (pfd);
pango_font_description_free (pfd);
for (list = buffer->font_tags; list; list = g_list_next (list))
{
@ -836,22 +840,23 @@ gimp_text_buffer_get_font_tag (GimpTextBuffer *buffer,
tag_font = gimp_text_tag_get_font (tag);
if (! strcmp (font, tag_font))
if (! strcmp (description, tag_font))
{
g_free (tag_font);
g_free (description);
return tag;
}
g_free (tag_font);
}
g_snprintf (name, sizeof (name), "font-%s", font);
g_snprintf (name, sizeof (name), "font-%s", description);
tag = gtk_text_buffer_create_tag (GTK_TEXT_BUFFER (buffer),
name,
"font", font,
"font", description,
NULL);
g_free (description);
buffer->font_tags = g_list_prepend (buffer->font_tags, tag);
return tag;