# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1139642609 0
# Node ID 3a3538be5b6a3223d5225ed4355de4444d1a12be
# Parent  ca677053ac11abe200005bd5d98cf1edf1fa58a1
[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>

diff -r ca677053ac11 -r 3a3538be5b6a src/gtkimhtml.c
--- 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;
 }