[Gaim-commits] CVS: gaim/src conversation.h,1.54,1.55 gtkconv.c,1.498,1.499

[Stu T. <nos...@us...>]

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

Modified Files:
	conversation.h gtkconv.c 
Log Message:
More more MSN bug fixes from Felipe Contreras, and I fixed up the
display of messages that failed to send so that it matches what you
tried to send and doesn't have kittens with html entities and such.

I added a GAIM_MESSAGE_RAW type in HEAD to make the display of such
messages even more accurate, but I don't think such a cosmetic change,
which would bump us to 1.2.0, is all that important for oldstatus.



Index: conversation.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -p -r1.54 -r1.55
--- conversation.h	23 Nov 2004 06:14:11 -0000	1.54
+++ conversation.h	12 Dec 2004 17:37:33 -0000	1.55
@@ -118,7 +118,8 @@ typedef enum
 	GAIM_MESSAGE_NO_LOG    = 0x0040, /**< Do not log.              */
 	GAIM_MESSAGE_WHISPER   = 0x0080, /**< Whispered message.       */
 	GAIM_MESSAGE_ERROR     = 0x0200, /**< Error message.           */
-	GAIM_MESSAGE_DELAYED   = 0x0400  /**< Delayed message.         */
+	GAIM_MESSAGE_DELAYED   = 0x0400, /**< Delayed message.         */
+	GAIM_MESSAGE_RAW       = 0x0800  /**< "Raw" message - don't apply formatting */
 
 } GaimMessageFlags;
 

Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -d -p -r1.498 -r1.499
--- gtkconv.c	5 Dec 2004 21:05:51 -0000	1.498
+++ gtkconv.c	12 Dec 2004 17:37:34 -0000	1.499
@@ -5028,8 +5028,11 @@ gaim_gtkconv_write_conv(GaimConversation
 			   sml_attrib, message);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf, 0);
-	}
-	else {
+	} else if (flags & GAIM_MESSAGE_RAW) {
+		g_snprintf(buf, BUF_LONG, "%s", message);
+
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf, 0);
+	} else {
 		char *new_message = g_memdup(message, length);
 		char *who_escaped = (who ? g_markup_escape_text(who, strlen(who)) : g_strdup(""));
 
@@ -5079,7 +5082,7 @@ gaim_gtkconv_write_conv(GaimConversation
 							col.green = col.green * scale;
 							col.blue = col.blue * scale;
 						}
-						
+
 						g_snprintf(color, sizeof(color), "#%02X%02X%02X",
 							   col.red >> 8, col.green >> 8, col.blue >> 8);
 					} else