# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1171041827 0
# Node ID b03021cef5cb2304124a9046077c3b324e7a0455
# Parent  46db943326fb92fd207e73cdd61e0ccb2eda9d4e
SF Patch #1653845 from Matt Perry

"Consider what happens when you call gaim_conversation_write with flags = GAIM_MESSAGE_RAW|GAIM_MESSAGE_NO_LOG;

Intuitively, one would expect a raw message (no formatting when displayed), that is not written to the logs. However, in gaim_gtkconv_write_conv, NO_LOG is checked first and takes priority, adding additional formatting.

This patch simply changes the order of the checks, so that RAW is checked first and has priority over all other message types."

diff -r 46db943326fb -r b03021cef5cb COPYRIGHT
--- a/COPYRIGHT	Fri Feb 09 17:18:48 2007 +0000
+++ b/COPYRIGHT	Fri Feb 09 17:23:47 2007 +0000
@@ -245,6 +245,7 @@
 Havoc Pennington
 Ted Percival
 Eduardo Pérez
+Matt Perry
 Celso Pinto
 Joao Luís Marques Pinto
 Aleksander Piotrowski
diff -r 46db943326fb -r b03021cef5cb pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri Feb 09 17:18:48 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Feb 09 17:23:47 2007 +0000
@@ -4932,7 +4932,9 @@
 
 
 	/* TODO: These colors should not be hardcoded so log.c can use them */
-	if (flags & GAIM_MESSAGE_SYSTEM) {
+	if (flags & GAIM_MESSAGE_RAW) {
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), message, gtk_font_options_all);
+	} else if (flags & GAIM_MESSAGE_SYSTEM) {
 		g_snprintf(buf2, sizeof(buf2),
 			   "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>",
 			   sml_attrib ? sml_attrib : "", mdate, displaying);
@@ -4952,8 +4954,6 @@
 			   sml_attrib ? sml_attrib : "", displaying);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all);
-	} else if (flags & GAIM_MESSAGE_RAW) {
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), displaying, gtk_font_options_all);
 	} else {
 		char *new_message = g_memdup(displaying, length);
 		char *alias_escaped = (alias ? g_markup_escape_text(alias, strlen(alias)) : g_strdup(""));