[Gaim-commits] CVS: gaim/src gtkconv.c,1.655,1.656

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

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

Modified Files:
	gtkconv.c 
Log Message:
SF Patch #1355592 from Sadrul

'If I uncheck the "Show formatting on incoming
 messages", then it also starts ignoring the format of
 the outgoing messages -- which I don't believe is the
 intended behaviour. This patch fixes that.'


Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.655
retrieving revision 1.656
diff -u -d -p -r1.655 -r1.656
--- gtkconv.c	13 Nov 2005 00:19:11 -0000	1.655
+++ gtkconv.c	13 Nov 2005 01:03:43 -0000	1.656
@@ -4165,7 +4165,8 @@ gaim_gtkconv_write_conv(GaimConversation
 
 	gtk_font_options |= GTK_IMHTML_NO_COMMENTS;
 
-	if (!gaim_prefs_get_bool("/gaim/gtk/conversations/show_incoming_formatting"))
+	if ((flags & GAIM_MESSAGE_RECV) &&
+			!gaim_prefs_get_bool("/gaim/gtk/conversations/show_incoming_formatting"))
 		gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES | GTK_IMHTML_NO_FORMATTING;
 
 	/* this is gonna crash one day, I can feel it. */