# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1073429640 0
# Node ID 17b90334f3ccf35458f22fdc462fd2e3e062d34a
# Parent  d855559804953d76251b288b999ccdaa658a753d
[gaim-migrate @ 8706]
i think this is all ok

committer: Tailor Script <tailor@pidgin.im>

diff -r d85555980495 -r 17b90334f3cc src/gtkimhtml.c
--- a/src/gtkimhtml.c	Tue Jan 06 15:04:51 2004 +0000
+++ b/src/gtkimhtml.c	Tue Jan 06 22:54:00 2004 +0000
@@ -960,6 +960,7 @@
 	VALID_TAG ("/SPAN");
 	VALID_TAG ("BR/"); /* hack until gtkimhtml handles things better */
 	VALID_TAG ("IMG");
+	VALID_TAG("SPAN");
 
 	if (!g_ascii_strncasecmp(string, "!--", strlen ("!--"))) {
 		gchar *e = strstr (string + strlen("!--"), "-->");
@@ -1413,10 +1414,11 @@
 				case 49:	/* HTML (opt) */
 				case 50:	/* CITE */
 				case 51:	/* /CITE */
-				case 56:	/* SPAN */
+				case 56:	/* SPAN (opt) */
 				case 57:	/* /SPAN */
+				case 60:    /* SPAN */
 					break;
-				case 60:	/* comment */
+				case 61:	/* comment */
 					NEW_BIT (NEW_TEXT_BIT);
 					if (imhtml->show_comments)
 						wpos = g_snprintf (ws, len, "%s", tag);
diff -r d85555980495 -r 17b90334f3cc src/log.c
--- a/src/log.c	Tue Jan 06 15:04:51 2004 +0000
+++ b/src/log.c	Tue Jan 06 22:54:00 2004 +0000
@@ -485,9 +485,9 @@
 			date, from, msg_fixed);
 	else if (type & GAIM_MESSAGE_AUTO_RESP) {
 		if (type & GAIM_MESSAGE_SEND)
-			fprintf(data->file, _("<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"), date, from, msg_fixed);
+			fprintf(data->file, _("<font color=\"#16569E\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
 		else if (type & GAIM_MESSAGE_RECV)
-			fprintf(data->file, _("<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"), date, from, msg_fixed);
+			fprintf(data->file, _("<font color=\"#A82F2F\">(%s) <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
 	} else if (type & GAIM_MESSAGE_RECV) {
 		if(gaim_message_meify(msg_fixed, -1))
 			fprintf(data->file, "<font color=\"#6C2585\">(%s) <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
diff -r d85555980495 -r 17b90334f3cc src/util.c
--- a/src/util.c	Tue Jan 06 15:04:51 2004 +0000
+++ b/src/util.c	Tue Jan 06 22:54:00 2004 +0000
@@ -977,14 +977,13 @@
 						p++;
 					}
 					c = strchr(c, '>') + 1;
-					pt = g_new0(struct gaim_parse_tag, 1);
-					pt->src_tag = "font";
-					pt->dest_tag = "span";
-					tags = g_list_prepend(tags, pt);
-					xhtml = g_string_append(xhtml, "<span");
-					if(style->len)
-						g_string_append_printf(xhtml, " style='%s'", style->str);
-					xhtml = g_string_append_c(xhtml, '>');
+					if(style->len) {
+						pt = g_new0(struct gaim_parse_tag, 1);
+						pt->src_tag = "font";
+						pt->dest_tag = "span";
+						tags = g_list_prepend(tags, pt);
+						g_string_append_printf(xhtml, "<span style='%s'>", style->str);
+					}
 					g_string_free(style, TRUE);
 					continue;
 				}