Mercurial > pidgin.yaz
changeset 13223:3a3538be5b6a
[gaim-migrate @ 15587]
While tracking down a formatting bug that occurred when switching protocols in a contact-aware convo, SimGuy noticed that imhtml_clear_formatting didn't clear imhtml->edit.fontface. We both noticed that those values should be g_free()d before clearing them. I noticed that formatting wasn't clearing properly when I was testing a plain old AIM conversation and just hit Ctrl-R.
committer: Tailor Script <tailor@pidgin.im>
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 11 Feb 2006 07:23:29 +0000 |
| parents | ca677053ac11 |
| children | 2f6c932e5742 |
| files | src/gtkimhtml.c |
| diffstat | 1 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkimhtml.c Sat Feb 11 05:43:58 2006 +0000 +++ b/src/gtkimhtml.c Sat Feb 11 07:23:29 2006 +0000 @@ -3738,20 +3738,29 @@ gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "ITALICS", &start, &end); gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "UNDERLINE", &start, &end); gtk_text_buffer_remove_tag_by_name(imhtml->text_buffer, "STRIKE", &start, &end); - remove_font_size(imhtml, &start, &end, TRUE); - remove_font_face(imhtml, &start, &end, TRUE); - remove_font_forecolor(imhtml, &start, &end, TRUE); - remove_font_backcolor(imhtml, &start, &end, TRUE); - remove_font_background(imhtml, &start, &end, TRUE); - remove_font_link(imhtml, &start, &end, TRUE); + remove_font_size(imhtml, &start, &end, FALSE); + remove_font_face(imhtml, &start, &end, FALSE); + remove_font_forecolor(imhtml, &start, &end, FALSE); + remove_font_backcolor(imhtml, &start, &end, FALSE); + remove_font_background(imhtml, &start, &end, FALSE); + remove_font_link(imhtml, &start, &end, FALSE); imhtml->edit.bold = 0; imhtml->edit.italic = 0; imhtml->edit.underline = 0; imhtml->edit.strike = 0; imhtml->edit.fontsize = 0; + + g_free(imhtml->edit.fontface); + imhtml->edit.fontface = NULL; + + g_free(imhtml->edit.forecolor); imhtml->edit.forecolor = NULL; + + g_free(imhtml->edit.backcolor); imhtml->edit.backcolor = NULL; + + g_free(imhtml->edit.background); imhtml->edit.background = NULL; }