[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.476,1.477

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3135/src

Modified Files:
	gtkimhtml.c 
Log Message:
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.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -d -p -r1.476 -r1.477
--- gtkimhtml.c	6 Feb 2006 08:02:03 -0000	1.476
+++ gtkimhtml.c	11 Feb 2006 07:23:29 -0000	1.477
@@ -3738,20 +3738,29 @@ imhtml_clear_formatting(GtkIMHtml *imhtm
 	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;
 }