diff src/gtkconv.c @ 10666:b39d5850883a

[gaim-migrate @ 12206] Igor Belyi thinks the correct way to maintain persistent formatting is to let default formatting override it. I'm not sure if I agree yet, but I'll try it out. Also, this increases the need for HTML pastes into the conversation to end all their tags at the end of the paste. I think I did this with the gtkimhtml.c change, but I'm not positive. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Mon, 07 Mar 2005 18:58:52 +0000
parents 4829abdc5c35
children 210e38f53b7b
line wrap: on
line diff
--- a/src/gtkconv.c	Mon Mar 07 18:36:34 2005 +0000
+++ b/src/gtkconv.c	Mon Mar 07 18:58:52 2005 +0000
@@ -199,7 +199,7 @@
 default_formatize(GaimConversation *conv)
 {
 	GaimGtkConversation *c = GAIM_GTK_CONVERSATION(conv);
-
+		
 	if (conv->features & GAIM_CONNECTION_HTML)
 	{
 		if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_formatting"))
@@ -207,13 +207,13 @@
 			char *color;
 			GdkColor fg_color, bg_color;
 
-			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold"))
+			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold") != GTK_IMHTML(c->entry)->edit.bold)
 				gtk_imhtml_toggle_bold(GTK_IMHTML(c->entry));
 
-			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic"))
+			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic") != GTK_IMHTML(c->entry)->edit.italic)
 				gtk_imhtml_toggle_italic(GTK_IMHTML(c->entry));
 
-			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_underline"))
+			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_underline") != GTK_IMHTML(c->entry)->edit.underline)
 				gtk_imhtml_toggle_underline(GTK_IMHTML(c->entry));
 
 			gtk_imhtml_toggle_fontface(GTK_IMHTML(c->entry),