[Gaim-commits] CVS: gaim/src log.c,1.48,1.49

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18228/src

Modified Files:
	log.c 
Log Message:
This will produce better logs.  I'm going to try to get even *better* logs


Index: log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -p -r1.48 -r1.49
--- log.c	11 Nov 2003 20:33:59 -0000	1.48
+++ log.c	13 Nov 2003 00:48:05 -0000	1.49
@@ -382,6 +382,7 @@ static GaimLogLogger xml_logger =  {
 static void html_logger_write(GaimLog *log, GaimMessageFlags type,
 		const char *from, time_t time, const char *message)
 {
+	GaimConnection *gc = gaim_account_get_connection(log->account);
 	char date[64];
 	if(!log->logger_data) {
 		/* This log is new */
@@ -436,7 +437,22 @@ static void html_logger_write(GaimLog *l
 			log->name, date, gaim_account_get_username(log->account), prpl);
 	}
 	strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
-	fprintf(log->logger_data, "(%s) %s%s %s<br/>\n", date, from ? from : "", from ? ":" : "", message);
+	if (type & GAIM_MESSAGE_SYSTEM)
+		fprintf(log->logger_data, "(%s)<b> %s</b><br/>\n", date, message);
+	else if (type & GAIM_MESSAGE_WHISPER)
+		fprintf(log->logger_data, "<font color=\"#6C2585\">(%s)<b> %s:</b></font> %s<br/>\n",
+			date, from, message);
+	else if (type & GAIM_MESSAGE_AUTO_RESP) {
+		if (type & GAIM_MESSAGE_SEND)
+			fprintf(log->logger_data, _("<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"), date, from, message);
+		else if (type & GAIM_MESSAGE_RECV)
+			fprintf(log->logger_data, _("<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"), date, from, message);
+	} else if (type & GAIM_MESSAGE_RECV)
+		fprintf(log->logger_data, "<font color=\"#A82F2F\">(%s) <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n", 
+			date, from, gc->prpl->info->name, message);
+	else if (type & GAIM_MESSAGE_RECV)
+		fprintf(log->logger_data, "<font color=\"#16569E\">(%s) <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n", 
+			date, from, gc->prpl->info->name, message);
 	fflush(log->logger_data);
 }
 
@@ -546,7 +562,22 @@ static void txt_logger_write(GaimLog *lo
 
 	strftime(date, sizeof(date), "%H:%M:%S", localtime(&time));
 	stripped = gaim_markup_strip_html(message);
-	fprintf(log->logger_data, "(%s) %s%s %s\n", date, from ? from : "", from ? ":" : "", stripped);
+	if (type & GAIM_MESSAGE_SEND ||
+	    type & GAIM_MESSAGE_RECV)
+		fprintf(log->logger_data, "(%s) %s: %s\n", date, from, stripped);	
+	else if (type & GAIM_MESSAGE_SYSTEM)
+		fprintf(log->logger_data, "(%s) %s\n", date, stripped);
+	else if (type & GAIM_MESSAGE_AUTO_RESP)
+		fprintf(log->logger_data, _("(%s) %s <AUTO-REPLY>: %s\n"), date, from, stripped);
+	else if (type & GAIM_MESSAGE_NO_LOG) {
+		/* This shouldn't happen */
+		g_free(stripped);
+		return;
+	} else if (type & GAIM_MESSAGE_WHISPER)
+		fprintf(log->logger_data, "(%s) *%s* %s", date, from, stripped);
+	else
+		fprintf(log->logger_data, "(%s) %s%s %s\n", date, from ? from : "", from ? ":" : "", stripped);
+
 	fflush(log->logger_data);
 	g_free(stripped);
 }