[Gaim-commits] SF.net SVN: gaim: [16426] branches/soc-2006-file-loggers/src/log.c

[<ro...@us...>]

Revision: 16426
Author:   roast
Date:     2006-07-04 15:51:43 -0700 (Tue, 04 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16426&view=rev

Log Message:
-----------
cosmetic change in html_logger, and add the written buffer length only if giochannel operation didn't fail

Modified Paths:
--------------
    branches/soc-2006-file-loggers/src/log.c
Modified: branches/soc-2006-file-loggers/src/log.c
===================================================================
--- branches/soc-2006-file-loggers/src/log.c	2006-07-04 22:45:48 UTC (rev 16425)
+++ branches/soc-2006-file-loggers/src/log.c	2006-07-04 22:51:43 UTC (rev 16426)
@@ -1053,8 +1053,7 @@
 			g_error_free(gerror);
 			gerror = NULL;
 		}
-
-		written += written_buf;
+		else written += written_buf;
 	}
 
 	/* if we can't write to the file, give up before we hurt ourselves */
@@ -1116,7 +1115,7 @@
 		g_error_free(gerror);
 		gerror = NULL;
 	}
-	written += written_buf;
+	else written += written_buf;
 
 	g_free(date);
 	g_free(msg_fixed);
@@ -1278,7 +1277,7 @@
 			g_error_free(gerror);
 			gerror = NULL;
 		}
-		written += written_buf;
+		else written += written_buf;
 	}
 
 	/* if we can't write to the file, give up before we hurt ourselves */
@@ -1288,9 +1287,9 @@
 	gaim_markup_html_to_xhtml(message, &msg_fixed, NULL);
 	date = log_get_timestamp(log, time);
 
-	if(log->type == GAIM_LOG_SYSTEM){
+	if(log->type == GAIM_LOG_SYSTEM)
 		g_string_printf(writebuf, "---- %s @ %s ----<br/>\n", msg_fixed, date);
-	} else if (type & GAIM_MESSAGE_SYSTEM)
+	else if (type & GAIM_MESSAGE_SYSTEM)
 		g_string_printf(writebuf, "<font size=\"2\">(%s)</font><b> %s</b><br/>\n", date, msg_fixed);
 	else if (type & GAIM_MESSAGE_ERROR)
 		g_string_printf(writebuf, "<font color=\"#FF0000\"><font size=\"2\">(%s)</font><b> %s</b></font><br/>\n", date, msg_fixed);
@@ -1330,7 +1329,7 @@
 		g_error_free(gerror);
 		gerror = NULL;
 	}
-	written += written_buf;
+	else written += written_buf;
 
 	iostat = g_io_channel_flush(data->channel, &gerror);
 	if (iostat == G_IO_STATUS_ERROR) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.