changeset 636:072200640327

[gaim-migrate @ 646] tra la la committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 07 Aug 2000 22:31:25 +0000
parents 2ad1a8234ef1
children 8f0ba638d819
files src/aim.c src/conversation.c
diffstat 2 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/aim.c	Mon Aug 07 21:46:24 2000 +0000
+++ b/src/aim.c	Mon Aug 07 22:31:25 2000 +0000
@@ -548,7 +548,7 @@
 
 #if HAVE_SIGNAL_H
 	/* Let's not violate any PLA's!!!! */
-	signal(SIGSEGV, sighandler);
+	/* signal(SIGSEGV, sighandler); */
 #endif
 
 	if (argc > 1 && !strcmp(argv[1], "--version")) {
--- a/src/conversation.c	Mon Aug 07 21:46:24 2000 +0000
+++ b/src/conversation.c	Mon Aug 07 22:31:25 2000 +0000
@@ -1104,9 +1104,12 @@
 void write_to_conv(struct conversation *c, char *what, int flags, char *who)
 {
 	char *buf = g_malloc(BUF_LONG);
+	char buf2[1024];
 	char *str;
         FILE *fd;
         char colour[10];
+	int colorv = -1;
+	char *clr;
 	char *smiley = g_malloc(7);
 
 	if (!who) {
@@ -1141,6 +1144,9 @@
                 }
                 
         } else {
+		if ((clr = strstr(what, "<BODY BGCOLOR=\"#")) != NULL) {
+			sscanf(clr + strlen("<BODY BGCOLOR=\"#"), "%x", &colorv);
+		}
 
 		if (flags & WFLAG_WHISPER) {
 			/* if we're whispering, it's not an autoresponse */
@@ -1183,6 +1189,11 @@
 
                 gtk_html_freeze(GTK_HTML(c->text));
 
+		if (colorv != -1) {
+			sprintf(buf2, "<BODY BGCOLOR=\"#%x\">", colorv);
+			gtk_html_append_text(GTK_HTML(c->text), buf2, 0);
+		}
+
 		gtk_html_append_text(GTK_HTML(c->text), buf, 0);
 
 		if (display_options & OPT_DISP_SHOW_SMILEY)
@@ -1194,6 +1205,9 @@
 			gtk_html_append_text(GTK_HTML(c->text), what, (display_options & OPT_DISP_IGNORE_COLOUR) ? HTML_OPTION_NO_COLOURS : 0);
 		}
 
+		if (colorv != -1) {
+			gtk_html_append_text(GTK_HTML(c->text), "</BODY>", 0);
+		}
                 gtk_html_append_text(GTK_HTML(c->text), "<BR>", 0);