[Gaim-commits] SF.net SVN: gaim: [17551] trunk/console/plugins/gnthistory.c

[<sa...@us...>]

Revision: 17551
          http://svn.sourceforge.net/gaim/?rev=17551&view=rev
Author:   sadrul
Date:     2006-10-19 17:19:41 -0700 (Thu, 19 Oct 2006)

Log Message:
-----------
Do not print an extra newline for HTML logs.

(20:17:27) seanegan: sadrul: are you checking the flags from gaim_log_read?
(20:18:18) elb: sadrul: for HTML logs, it should strip 0x0a and turn <br> into 0x0a

Modified Paths:
--------------
    trunk/console/plugins/gnthistory.c

Modified: trunk/console/plugins/gnthistory.c
===================================================================
--- trunk/console/plugins/gnthistory.c	2006-10-19 22:17:30 UTC (rev 17550)
+++ trunk/console/plugins/gnthistory.c	2006-10-20 00:19:41 UTC (rev 17551)
@@ -45,7 +45,7 @@
 	GaimConversationType convtype;
 	GList *logs = NULL;
 	const char *alias = name;
-	guint flags;
+	GaimLogReadFlags flags;
 	char *history;
 	char *header;
 	GaimMessageFlags mflag;
@@ -119,7 +119,8 @@
 	gaim_conversation_write(c, "", header, mflag, time(NULL));
 	g_free(header);
 
-	g_strchomp(history);
+	if (flags & GAIM_LOG_READ_NO_NEWLINE)
+		gaim_str_strip_char(history, '\n');
 	gaim_conversation_write(c, "", history, mflag, time(NULL));
 	g_free(history);
 


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